diff --git a/debian/changelog b/debian/changelog
index bc2854050..740be6e4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux (4.0.4-2) UNRELEASED; urgency=medium
+
+  * udeb: Remove i2o modules (fixes FTBFS on amd64)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 27 May 2015 21:36:56 +0100
+
 linux (4.0.4-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/installer/amd64/modules/amd64/scsi-extra-modules b/debian/installer/amd64/modules/amd64/scsi-extra-modules
index 61c0e6619..cd13edec5 100644
--- a/debian/installer/amd64/modules/amd64/scsi-extra-modules
+++ b/debian/installer/amd64/modules/amd64/scsi-extra-modules
@@ -1,4 +1 @@
 #include <scsi-extra-modules>
-dpt_i2o -
-i2o_block
-i2o_scsi
diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules
index cbbc14583..6d50549df 100644
--- a/debian/installer/modules/scsi-extra-modules
+++ b/debian/installer/modules/scsi-extra-modules
@@ -21,7 +21,6 @@ fnic ?
 gdth ?
 hpsa ?
 hptiop ?
-i2o_block ?
 ibmmca ?
 ips
 isci ?