diff --git a/debian/changelog b/debian/changelog
index e58798566645..25beba5c63e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ linux-2.6 (3.0.0-7) UNRELEASED; urgency=low
   * [s390x] Add s390x udebs, based on linux-kernel-di-s390x-2.6.
   * [sparc64] Sync udebs with sparc.
 
+  [ Ben Hutchings ]
+  * Fix module selection for {ata,ide,scsi-core}-modules udebs on powerpc
+
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 06 Nov 2011 12:20:59 +0100
 
 linux-2.6 (3.0.0-6) unstable; urgency=high
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules
new file mode 100644
index 000000000000..419883c02459
--- /dev/null
+++ b/debian/installer/powerpc/modules/powerpc-powerpc-miboot/ide-core-modules
@@ -0,0 +1 @@
+#include "../powerpc/ide-core-modules"
diff --git a/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules b/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules
new file mode 100644
index 000000000000..419883c02459
--- /dev/null
+++ b/debian/installer/powerpc/modules/powerpc-powerpc64/ide-core-modules
@@ -0,0 +1 @@
+#include "../powerpc/ide-core-modules"
diff --git a/debian/installer/powerpc/modules/powerpc/ata-modules b/debian/installer/powerpc/modules/powerpc/ata-modules
index 9409e7cde816..be78de0c14a3 100644
--- a/debian/installer/powerpc/modules/powerpc/ata-modules
+++ b/debian/installer/powerpc/modules/powerpc/ata-modules
@@ -1,2 +1,2 @@
 #include <ata-modules>
-
+libata -
diff --git a/debian/installer/powerpc/modules/powerpc/ide-core-modules b/debian/installer/powerpc/modules/powerpc/ide-core-modules
new file mode 100644
index 000000000000..57822c521b5d
--- /dev/null
+++ b/debian/installer/powerpc/modules/powerpc/ide-core-modules
@@ -0,0 +1 @@
+#include <ide-core-modules>
diff --git a/debian/installer/powerpc/modules/powerpc/scsi-core-modules b/debian/installer/powerpc/modules/powerpc/scsi-core-modules
index 4684cabbe308..6ec85bb77d8a 100644
--- a/debian/installer/powerpc/modules/powerpc/scsi-core-modules
+++ b/debian/installer/powerpc/modules/powerpc/scsi-core-modules
@@ -1,2 +1,3 @@
 #include <scsi-core-modules>
+scsi_mod -
 scsi_transport_spi