diff --git a/debian/changelog b/debian/changelog
index 3ccb7987f..67cf26147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux (3.2.20-2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [ia64,powerpc] udeb: Add crc-itu-t to crc-modules; make
+    firewire-core-modules depend on it (fixes FTBFS)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 12 Jun 2012 06:21:34 +0100
+
 linux (3.2.20-1) unstable; urgency=low
 
   * The "Confused? You Won't Be" release
diff --git a/debian/installer/amd64/modules/amd64/crc-modules b/debian/installer/amd64/modules/amd64/crc-modules
index 109184c31..7e00de705 100644
--- a/debian/installer/amd64/modules/amd64/crc-modules
+++ b/debian/installer/amd64/modules/amd64/crc-modules
@@ -1,2 +1 @@
 #include <crc-modules>
-crc-itu-t
diff --git a/debian/installer/amd64/package-list b/debian/installer/amd64/package-list
index e3f8d11d5..18e1e18ab 100644
--- a/debian/installer/amd64/package-list
+++ b/debian/installer/amd64/package-list
@@ -28,8 +28,5 @@ Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, crypto-cor
 Package: pcmcia-modules
 Depends: kernel-image, core-modules
 
-Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules, crc-modules
-
 Package: nbd-modules
 Depends: kernel-image
diff --git a/debian/installer/i386/modules/i386/crc-modules b/debian/installer/i386/modules/i386/crc-modules
index 7a6e979f2..7e00de705 100644
--- a/debian/installer/i386/modules/i386/crc-modules
+++ b/debian/installer/i386/modules/i386/crc-modules
@@ -1,2 +1 @@
 #include <crc-modules>
-crc-itu-t ?
diff --git a/debian/installer/i386/package-list b/debian/installer/i386/package-list
index 9e623fc65..cdd63fc3e 100644
--- a/debian/installer/i386/package-list
+++ b/debian/installer/i386/package-list
@@ -31,8 +31,5 @@ Depends: kernel-image, nic-shared-modules, core-modules, usb-modules, crypto-cor
 Package: pcmcia-modules
 Depends: kernel-image, core-modules
 
-Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules, crc-modules
-
 Package: nbd-modules
 Depends: kernel-image
diff --git a/debian/installer/modules/crc-modules b/debian/installer/modules/crc-modules
index 0b8ec0ada..8f86016fb 100644
--- a/debian/installer/modules/crc-modules
+++ b/debian/installer/modules/crc-modules
@@ -1,3 +1,4 @@
 crc-ccitt
 libcrc32c
 crc32c
+crc-itu-t
diff --git a/debian/installer/package-list b/debian/installer/package-list
index 4191875fc..0b68c54bc 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -84,7 +84,7 @@ Description: Esoteric CDROM drivers
  This package contains esoteric CDROM drivers for the kernel.
 
 Package: firewire-core-modules
-Depends: kernel-image, scsi-core-modules
+Depends: kernel-image, scsi-core-modules, crc-modules
 Priority: standard
 Description: Core FireWire drivers
  This package contains core FireWire drivers for the kernel.