diff --git a/debian/changelog b/debian/changelog
index 00480cd07..53a1d7fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux (3.10~rc5-1~exp1) UNRELEASED; urgency=low
     - Only list the 'new' firewire modules in firewire-core-modules
     - Remove obsolete eth1394 and firewire-core-modules dependency from
       nic-modules
+    - Move ide-modules and ide-core-modules into ia64 configuration
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 03 Jun 2013 13:21:56 +0100
 
diff --git a/debian/installer/ia64/modules/ia64/cdrom-core-modules b/debian/installer/ia64/modules/ia64/cdrom-core-modules
index e264d7aa3..2c6b1565d 100644
--- a/debian/installer/ia64/modules/ia64/cdrom-core-modules
+++ b/debian/installer/ia64/modules/ia64/cdrom-core-modules
@@ -1,2 +1,2 @@
 #include <cdrom-core-modules>
-
+ide-cd_mod
diff --git a/debian/installer/ia64/modules/ia64/ide-core-modules b/debian/installer/ia64/modules/ia64/ide-core-modules
index 049d93f32..96284d155 100644
--- a/debian/installer/ia64/modules/ia64/ide-core-modules
+++ b/debian/installer/ia64/modules/ia64/ide-core-modules
@@ -1,2 +1 @@
-#include <ide-core-modules>
-
+ide-core
diff --git a/debian/installer/ia64/modules/ia64/ide-modules b/debian/installer/ia64/modules/ia64/ide-modules
index bac4ee111..3bbc4df76 100644
--- a/debian/installer/ia64/modules/ia64/ide-modules
+++ b/debian/installer/ia64/modules/ia64/ide-modules
@@ -1,2 +1,3 @@
-#include <ide-modules>
+ide-gd_mod
 sgiioc4
+trm290
diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list
index a5cee4179..a814188d3 100644
--- a/debian/installer/ia64/package-list
+++ b/debian/installer/ia64/package-list
@@ -6,8 +6,20 @@
 Package: fat-modules
 Priority: standard
 
+Package: ide-core-modules
+Depends: kernel-image
+Priority: standard
+Description: IDE support
+ This package contains core IDE support for the kernel.
+
 Package: ide-modules
 Depends: kernel-image, ide-core-modules, sn-modules
+Priority: standard
+Description: IDE drivers
+ This package contains IDE drivers for the kernel.
+
+Package: cdrom-core-modules
+Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules
 
 Package: nic-modules
 Depends: kernel-image, nic-shared-modules, core-modules, crc-modules
diff --git a/debian/installer/modules/cdrom-core-modules b/debian/installer/modules/cdrom-core-modules
index 07d11785e..62e5e83a3 100644
--- a/debian/installer/modules/cdrom-core-modules
+++ b/debian/installer/modules/cdrom-core-modules
@@ -1,3 +1,2 @@
 cdrom ?
 sr_mod ?
-ide-cd_mod ?
diff --git a/debian/installer/modules/ide-core-modules b/debian/installer/modules/ide-core-modules
deleted file mode 100644
index 96284d155..000000000
--- a/debian/installer/modules/ide-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-ide-core
diff --git a/debian/installer/modules/ide-modules b/debian/installer/modules/ide-modules
deleted file mode 100644
index 637d42fc4..000000000
--- a/debian/installer/modules/ide-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-ide-generic ?
-ide-gd_mod ?
-trm290 ?
diff --git a/debian/installer/package-list b/debian/installer/package-list
index ac5e5221d..b9d65a300 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -53,26 +53,14 @@ Priority: optional
 Description: PPP drivers
  This package contains PPP drivers for the kernel.
 
-Package: ide-modules
-Depends: kernel-image, ide-core-modules
-Priority: standard
-Description: IDE drivers
- This package contains IDE drivers for the kernel.
-
 Package: pata-modules
 Depends: kernel-image, ata-modules
 Priority: standard
 Description: PATA drivers
  This package contains PATA drivers for the kernel.
 
-Package: ide-core-modules
-Depends: kernel-image
-Priority: standard
-Description: IDE support
- This package contains core IDE support for the kernel.
-
 Package: cdrom-core-modules
-Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules
+Depends: kernel-image, scsi-core-modules, isofs-modules
 Priority: standard
 Description: CDROM support
  This package contains core CDROM support for the kernel.