diff --git a/debian/NEWS b/debian/NEWS
index d2c9aeeb4..d15f98676 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,15 @@
+linux-2.6 (2.6.32-11) unstable; urgency=low
+
+  * This release replaces the old IDE (PATA) drivers with new drivers
+    using 'libata' on all architectures.  This change was previously made
+    for the i386 and amd64 architectures.
+
+    The automatic upgrade code does not support the configuration files
+    of many of the boot loaders used on other architectures, so you may
+    be prompted to make changes manually.
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 20 Mar 2010 05:48:31 +0000
+
 linux-2.6 (2.6.32-10) unstable; urgency=low
 
   * The old IDE (PATA) drivers are no longer developed.  Most PATA
diff --git a/debian/changelog b/debian/changelog
index 51052e3f1..0c4294b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ linux-2.6 (2.6.32-11) UNRELEASED; urgency=low
   [ Ben Hutchings ]
   * tracing: do not disable interrupts for trace_clock_local.
   * [sparc] Provide io{read,write}{16,32}be() (Closes: #574421)
+  * Use libata-based drivers for most PATA controllers on all architectures
+    (previously applied only to x86)
 
   [ maximilian attems]
    * [alpha, hppa] Disable oprofile as tracing code is unsupported here.
diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x
index 72f5e046c..f8fd4fcb0 100644
--- a/debian/config/armel/config.iop32x
+++ b/debian/config/armel/config.iop32x
@@ -73,7 +73,23 @@ CONFIG_SATA_SIS=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
-# CONFIG_PATA_ARTOP is not set
+CONFIG_PATA_ALI=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_VIA=m
 
 ##
 ## file: drivers/block/Kconfig
@@ -216,29 +232,29 @@ CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_OFFBOARD=y
-CONFIG_BLK_DEV_GENERIC=m
+# CONFIG_BLK_DEV_GENERIC is not set
 CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
 CONFIG_BLK_DEV_CY82C693=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
 CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_SC1200=m
+# CONFIG_BLK_DEV_SC1200 is not set
 CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
 CONFIG_BLK_DEV_SL82C105=m
-CONFIG_BLK_DEV_SLC90E66=m
+# CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
+# CONFIG_BLK_DEV_VIA82CXXX is not set
 
 ##
 ## file: drivers/input/gameport/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 862f8750e..fd57c67df 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -125,7 +125,7 @@ CONFIG_ATA_GENERIC=m
 # CONFIG_PATA_HPT3X2N is not set
 # CONFIG_PATA_HPT3X3 is not set
 # CONFIG_PATA_ISAPNP is not set
-# CONFIG_PATA_IT821X is not set
+CONFIG_PATA_IT821X=m
 # CONFIG_PATA_IT8213 is not set
 CONFIG_PATA_JMICRON=m
 # CONFIG_PATA_LEGACY is not set
@@ -443,7 +443,7 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_BLK_DEV_JMICRON is not set
 CONFIG_BLK_DEV_IT8172=m
 CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
+# CONFIG_BLK_DEV_IT821X is not set
 CONFIG_BLK_DEV_TC86C001=m
 
 ##
diff --git a/debian/config/ia64/config b/debian/config/ia64/config
index 45c2cadca..d64c6a684 100644
--- a/debian/config/ia64/config
+++ b/debian/config/ia64/config
@@ -52,6 +52,23 @@ CONFIG_ACPI_CONTAINER=y
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_VIA=m
 
 ##
 ## file: drivers/block/Kconfig
@@ -231,28 +248,28 @@ CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_IDE_GENERIC=m
 # CONFIG_BLK_DEV_IDEPNP is not set
-CONFIG_BLK_DEV_GENERIC=m
+# CONFIG_BLK_DEV_GENERIC is not set
 CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
 CONFIG_BLK_DEV_CY82C693=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
 CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_SC1200=m
+# CONFIG_BLK_DEV_SC1200 is not set
 CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
 CONFIG_BLK_DEV_SGIIOC4=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SLC90E66=m
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
+# CONFIG_BLK_DEV_VIA82CXXX is not set
 
 ##
 ## file: drivers/ieee1394/Kconfig
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index 529ce0a53..f67f531a7 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -83,7 +83,7 @@ CONFIG_CRYPTO_TWOFISH_586=m
 ## file: drivers/ata/Kconfig
 ##
 # CONFIG_PATA_CS5535 is not set
-# CONFIG_PATA_CS5536 is not set
+CONFIG_PATA_CS5536=m
 
 ##
 ## file: drivers/atm/Kconfig
@@ -154,7 +154,7 @@ CONFIG_SCx200_I2C_SDA=13
 ## file: drivers/ide/Kconfig
 ##
 CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
+# CONFIG_BLK_DEV_CS5536 is not set
 # CONFIG_BLK_DEV_4DRIVES is not set
 # CONFIG_BLK_DEV_ALI14XX is not set
 # CONFIG_BLK_DEV_DTC2278 is not set
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index df50b6fa5..0b301f2da 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -120,7 +120,7 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_SIL24=y
 # CONFIG_SATA_SVW is not set
-# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_PIIX=y
 CONFIG_SATA_MV=y
 # CONFIG_SATA_NV is not set
 # CONFIG_PDC_ADMA is not set
@@ -132,7 +132,15 @@ CONFIG_SATA_SIL=y
 # CONFIG_SATA_ULI is not set
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
-# CONFIG_ATA_GENERIC is not set
+CONFIG_PATA_CMD64X=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_SIL680=y
 
 ##
 ## file: drivers/atm/Kconfig
@@ -360,12 +368,12 @@ CONFIG_BLK_DEV_IDETAPE=m
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=y
+# CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5520 is not set
@@ -376,10 +384,10 @@ CONFIG_BLK_DEV_HPT366=y
 CONFIG_BLK_DEV_PIIX=y
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
-CONFIG_BLK_DEV_SIIMAGE=y
+# CONFIG_BLK_DEV_SIIMAGE is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 280d1ae86..ac44a48bc 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -105,7 +105,7 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_SIL24=y
 # CONFIG_SATA_SVW is not set
-# CONFIG_ATA_PIIX is not set
+CONFIG_ATA_PIIX=y
 CONFIG_SATA_MV=y
 # CONFIG_SATA_NV is not set
 # CONFIG_PDC_ADMA is not set
@@ -118,7 +118,15 @@ CONFIG_SATA_SIL=y
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
 CONFIG_SATA_INIC162X=m
-# CONFIG_ATA_GENERIC is not set
+CONFIG_PATA_CMD64X=y
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_NETCELL=y
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_SIL680=y
 
 ##
 ## file: drivers/atm/Kconfig
@@ -358,12 +366,12 @@ CONFIG_IDE_PROC_FS=y
 CONFIG_IDE_GENERIC=y
 CONFIG_IDEPCI_PCIBUS_ORDER=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_AEC62XX is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=y
+# CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5520 is not set
@@ -374,10 +382,10 @@ CONFIG_BLK_DEV_HPT366=y
 CONFIG_BLK_DEV_PIIX=y
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_NS87415 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
 # CONFIG_BLK_DEV_SVWKS is not set
-CONFIG_BLK_DEV_SIIMAGE=y
+# CONFIG_BLK_DEV_SIIMAGE is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_VIA82CXXX is not set
diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b
index 0bcac785a..c1a855318 100644
--- a/debian/config/mips/config.sb1a-bcm91480b
+++ b/debian/config/mips/config.sb1a-bcm91480b
@@ -136,6 +136,21 @@ CONFIG_SATA_SIS=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_VIA=m
 
 ##
 ## file: drivers/block/Kconfig
@@ -283,26 +298,26 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
 CONFIG_BLK_DEV_CY82C693=m
 # CONFIG_BLK_DEV_CS5520 is not set
-CONFIG_BLK_DEV_CS5530=m
+# CONFIG_BLK_DEV_CS5530 is not set
 CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_SC1200=m
+# CONFIG_BLK_DEV_SC1200 is not set
 CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SLC90E66=m
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
+# CONFIG_BLK_DEV_VIA82CXXX is not set
 
 ##
 ## file: drivers/infiniband/Kconfig
diff --git a/debian/linux-base.postinst b/debian/linux-base.postinst
index 65c963836..a1fd6b981 100644
--- a/debian/linux-base.postinst
+++ b/debian/linux-base.postinst
@@ -522,6 +522,12 @@ sub lilo_post {
     system('lilo');
 }
 
+### SILO
+
+sub silo_post {
+    system('silo');
+}
+
 ### ELILO
 
 sub elilo_post {
@@ -832,6 +838,22 @@ my @config_files = ({packages => 'mount',
 		     update => \&lilo_update,
 		     post_update => \&lilo_post,
 		     is_boot_loader => 1},
+		    {packages => 'silo',
+		     path => '/etc/silo.conf',
+		     list => \&lilo_list,
+		     update => \&lilo_update,
+		     post_update => \&silo_post,
+		     is_boot_loader => 1},
+		    {packages => 'quik',
+		     path => '/etc/quik.conf',
+		     list => \&lilo_list,
+		     update => \&lilo_update,
+		     is_boot_loader => 1},
+		    {packages => 'yaboot',
+		     path => '/etc/yaboot.conf',
+		     list => \&lilo_list,
+		     update => \&lilo_update,
+		     is_boot_loader => 1},
 		    {packages => 'elilo',
 		     path => '/etc/elilo.conf',
 		     list => \&lilo_list,
@@ -1364,9 +1386,13 @@ sub compare_versions {
 my $deb_arch = `dpkg --print-architecture`;
 chomp $deb_arch;
 
-if (($deb_arch eq 'i386' || $deb_arch eq 'amd64') &&
-    ($ARGV[0] eq 'reconfigure' || compare_versions($ARGV[1], '2.6.32-10') < 0)) {
-    DebianKernel::DiskId::transition();
+if ($deb_arch ne 's390') {
+    my $libata_transition_ver =
+	($deb_arch eq 'i386' || $deb_arch eq 'amd64') ? '2.6.32-10' : '2.6.32-11';
+    if ($ARGV[0] eq 'reconfigure' ||
+	compare_versions($ARGV[1], $libata_transition_ver) < 0) {
+	DebianKernel::DiskId::transition();
+    }
 }
 
 exec("set -e\nset -- @ARGV\n" . << 'EOF');
diff --git a/debian/linux-base.templates b/debian/linux-base.templates
index 02dfddd8b..b72f0d5c5 100644
--- a/debian/linux-base.templates
+++ b/debian/linux-base.templates
@@ -56,4 +56,5 @@ Description: Check the boot loader configuration before rebooting
   * The root device id passed as a kernel parameter
   * The boot device id used to install and update the boot loader
  .
- We recommend that you identify these devices by UUID or label.
+ We recommend that you identify these devices by UUID or label, except that
+ on MIPS systems this is not supported for the root device.