diff --git a/debian/changelog b/debian/changelog
index 342c988a9..028bd4425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,9 +25,10 @@ linux (3.9.4-1) UNRELEASED; urgency=low
   * [powerpcspe] Prevent building uImage with missing mkimage, thanks to
     Roland Stigge (Closes: #708094)
   * udeb: Fix yet more configuration errors causing FTBFS:
-    - [powerpcspe] Add llc to nic-shared-modules (Closes: #708662)
     - [powerpc/powerpc64] Replace ibmvscsic with ibmvscsi in scsi-modules
     - [ppc64] Use symlinks to follow powerpc/powerpc64 configuration
+    - [powerpcspe] Use symlinks to follow powerpc configuration
+      (Closes: #708336, #708662)
   * netfilter: Enable NETFILTER_XT_MATCH_BPF, NETFILTER_XT_MATCH_CONNLABEL
     as modules
   * bridge: Enable BRIDGE_VLAN_FILTERING
diff --git a/debian/installer/powerpcspe/modules/powerpc b/debian/installer/powerpcspe/modules/powerpc
new file mode 120000
index 000000000..207f2439c
--- /dev/null
+++ b/debian/installer/powerpcspe/modules/powerpc
@@ -0,0 +1 @@
+../../powerpc/modules/powerpc
\ No newline at end of file
diff --git a/debian/installer/powerpcspe/modules/powerpcspe b/debian/installer/powerpcspe/modules/powerpcspe
new file mode 120000
index 000000000..207f2439c
--- /dev/null
+++ b/debian/installer/powerpcspe/modules/powerpcspe
@@ -0,0 +1 @@
+../../powerpc/modules/powerpc
\ No newline at end of file
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot
new file mode 120000
index 000000000..7ec12d311
--- /dev/null
+++ b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot
@@ -0,0 +1 @@
+../../powerpc/modules/powerpc-powerpc-miboot/
\ No newline at end of file
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/affs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/affs-modules
deleted file mode 100644
index f12f6ace2..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/affs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/affs-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ata-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ata-modules
deleted file mode 100644
index 39540d4b6..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ata-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/btrfs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/btrfs-modules
deleted file mode 100644
index e261e1388..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <btrfs-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/cdrom-core-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/cdrom-core-modules
deleted file mode 100644
index feed89a1a..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/cdrom-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/cdrom-core-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules
deleted file mode 100644
index f05d06298..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <core-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crc-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crc-modules
deleted file mode 100644
index 7e00de705..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crc-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crc-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crypto-dm-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crypto-dm-modules
deleted file mode 100644
index 4c8f2354c..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-dm-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crypto-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crypto-modules
deleted file mode 100644
index 3a1e862b4..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/event-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/event-modules
deleted file mode 100644
index f8819afd3..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/event-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <event-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext2-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext2-modules
deleted file mode 100644
index b8cca99d8..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext2-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ext2-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext3-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext3-modules
deleted file mode 100644
index 3f963c993..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext3-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ext3-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext4-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext4-modules
deleted file mode 100644
index 394c577ce..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <ext4-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/fat-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/fat-modules
deleted file mode 100644
index 043dc5602..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/fat-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/fat-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/firewire-core-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/firewire-core-modules
deleted file mode 100644
index 035ab3162..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/firewire-core-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/floppy-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/floppy-modules
deleted file mode 100644
index fc290d9ca..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/floppy-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/floppy-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/fuse-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/fuse-modules
deleted file mode 100644
index 49bdce41b..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/fuse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/fuse-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/hfs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/hfs-modules
deleted file mode 100644
index a85f69143..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/hfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/hfs-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/input-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/input-modules
deleted file mode 100644
index 38a888940..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/input-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/input-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/irda-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/irda-modules
deleted file mode 100644
index c266dec80..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/irda-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/irda-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/isofs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/isofs-modules
deleted file mode 100644
index da4fa9a3c..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/isofs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <isofs-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/jfs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/jfs-modules
deleted file mode 100644
index b71ebd35e..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/jfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/jfs-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/kernel-image b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/kernel-image
deleted file mode 100644
index a0b7d0cf4..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/kernel-image"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/loop-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/loop-modules
deleted file mode 100644
index e2273687f..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/loop-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/loop-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/md-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/md-modules
deleted file mode 100644
index 93be33f95..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/md-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/md-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/mouse-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/mouse-modules
deleted file mode 100644
index 22aca9411..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/mouse-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/multipath-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/multipath-modules
deleted file mode 100644
index a8b69b253..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <multipath-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nbd-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nbd-modules
deleted file mode 100644
index 3c9b3e5d4..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nbd-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-extra-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-extra-modules
deleted file mode 100644
index 0beb9b1d1..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-extra-modules
+++ /dev/null
@@ -1,22 +0,0 @@
-dl2k
-fealnx
-hamachi
-ixgb
-ns83820
-r8169
-s2io
-starfire
-tlan
-3c359 ?
-abyss
-lanstreamer
-olympic
-tms380tr
-tmspci
-de2104x
-dmfe
-winbond-840
-prism54 ?
-p54pci
-p54usb
-yellowfin
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-modules
deleted file mode 100644
index 7578f4332..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-pcmcia-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-pcmcia-modules
deleted file mode 100644
index 3f521e9db..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/nic-pcmcia-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules
deleted file mode 100644
index 63af1555d..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpcspe/nic-shared-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pata-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pata-modules
deleted file mode 100644
index bb9cbe3ab..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pata-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pcmcia-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pcmcia-modules
deleted file mode 100644
index e508df664..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pcmcia-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pcmcia-storage-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pcmcia-storage-modules
deleted file mode 100644
index f00f24605..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/pcmcia-storage-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/pcmcia-storage-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ppp-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ppp-modules
deleted file mode 100644
index eb7ab74a5..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ppp-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ppp-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/reiserfs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/reiserfs-modules
deleted file mode 100644
index 3136f7aeb..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/reiserfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/reiserfs-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/sata-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/sata-modules
deleted file mode 100644
index 591ad7410..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/sata-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/sata-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-common-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-common-modules
deleted file mode 100644
index 17ad4c4c9..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-common-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-common-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-core-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-core-modules
deleted file mode 100644
index c972a4717..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-core-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-extra-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-extra-modules
deleted file mode 100644
index 2b98d8b2e..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-extra-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-extra-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-modules
deleted file mode 100644
index dd5ae9cce..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/scsi-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/scsi-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/serial-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/serial-modules
deleted file mode 100644
index 349196e30..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/serial-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/squashfs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/squashfs-modules
deleted file mode 100644
index 42d77887a..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <squashfs-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/udf-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/udf-modules
deleted file mode 100644
index b90d7ee9b..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <udf-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ufs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ufs-modules
deleted file mode 100644
index d8dbfd310..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/ufs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/ufs-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/uinput-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/uinput-modules
deleted file mode 100644
index 58a833779..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <uinput-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-modules
deleted file mode 100644
index 9c5b10a7b..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-serial-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-serial-modules
deleted file mode 100644
index e25b55862..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-serial-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-storage-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-storage-modules
deleted file mode 100644
index 5f278e65f..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/usb-storage-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/usb-storage-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/xfs-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/xfs-modules
deleted file mode 100644
index c850127e9..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/xfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include "../powerpc/xfs-modules"
diff --git a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/zlib-modules b/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/zlib-modules
deleted file mode 100644
index e02ad64bf..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe-powerpcspe-miboot/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/affs-modules b/debian/installer/powerpcspe/modules/powerpcspe/affs-modules
deleted file mode 100644
index 3f0e4bb90..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/affs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <affs-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/ata-modules b/debian/installer/powerpcspe/modules/powerpcspe/ata-modules
deleted file mode 100644
index be78de0c1..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/ata-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ata-modules>
-libata -
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/btrfs-modules b/debian/installer/powerpcspe/modules/powerpcspe/btrfs-modules
deleted file mode 100644
index e261e1388..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <btrfs-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/cdrom-core-modules b/debian/installer/powerpcspe/modules/powerpcspe/cdrom-core-modules
deleted file mode 100644
index e264d7aa3..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/cdrom-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <cdrom-core-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/core-modules b/debian/installer/powerpcspe/modules/powerpcspe/core-modules
deleted file mode 100644
index 73e336a32..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <core-modules>
-bestcomm-core ?
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/crc-modules b/debian/installer/powerpcspe/modules/powerpcspe/crc-modules
deleted file mode 100644
index 7e00de705..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/crc-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crc-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/crypto-dm-modules b/debian/installer/powerpcspe/modules/powerpcspe/crypto-dm-modules
deleted file mode 100644
index 4c8f2354c..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-dm-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/crypto-modules b/debian/installer/powerpcspe/modules/powerpcspe/crypto-modules
deleted file mode 100644
index 3a1e862b4..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/event-modules b/debian/installer/powerpcspe/modules/powerpcspe/event-modules
deleted file mode 100644
index f8819afd3..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/event-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <event-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/ext2-modules b/debian/installer/powerpcspe/modules/powerpcspe/ext2-modules
deleted file mode 100644
index bbaebc8f1..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/ext2-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ext2-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/ext3-modules b/debian/installer/powerpcspe/modules/powerpcspe/ext3-modules
deleted file mode 100644
index 55ef7d7bc..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/ext3-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ext3-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/ext4-modules b/debian/installer/powerpcspe/modules/powerpcspe/ext4-modules
deleted file mode 100644
index 394c577ce..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <ext4-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/fat-modules b/debian/installer/powerpcspe/modules/powerpcspe/fat-modules
deleted file mode 100644
index cce8fd30c..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/fat-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <fat-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/firewire-core-modules b/debian/installer/powerpcspe/modules/powerpcspe/firewire-core-modules
deleted file mode 100644
index dcac80af9..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <firewire-core-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/floppy-modules b/debian/installer/powerpcspe/modules/powerpcspe/floppy-modules
deleted file mode 100644
index 169fde52e..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/floppy-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <floppy-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/fuse-modules b/debian/installer/powerpcspe/modules/powerpcspe/fuse-modules
deleted file mode 100644
index 0b6ba0c8c..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/fuse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <fuse-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/hfs-modules b/debian/installer/powerpcspe/modules/powerpcspe/hfs-modules
deleted file mode 100644
index 57d12f649..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/hfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <hfs-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/input-modules b/debian/installer/powerpcspe/modules/powerpcspe/input-modules
deleted file mode 100644
index 51e37ced9..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/input-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <input-modules>
-atkbd
-i8042
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/irda-modules b/debian/installer/powerpcspe/modules/powerpcspe/irda-modules
deleted file mode 100644
index b141b585b..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/irda-modules
+++ /dev/null
@@ -1,7 +0,0 @@
-irtty-sir
-sir-dev
-ircomm-tty
-ircomm
-irda
-irlan
-irnet
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/isofs-modules b/debian/installer/powerpcspe/modules/powerpcspe/isofs-modules
deleted file mode 100644
index da4fa9a3c..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/isofs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <isofs-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/jfs-modules b/debian/installer/powerpcspe/modules/powerpcspe/jfs-modules
deleted file mode 100644
index 925a43a9e..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/jfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <jfs-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/kernel-image b/debian/installer/powerpcspe/modules/powerpcspe/kernel-image
deleted file mode 100644
index 1bb8bf6d7..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/loop-modules b/debian/installer/powerpcspe/modules/powerpcspe/loop-modules
deleted file mode 100644
index 164467713..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/loop-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <loop-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/md-modules b/debian/installer/powerpcspe/modules/powerpcspe/md-modules
deleted file mode 100644
index ade088ddb..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/md-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <md-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/mouse-modules b/debian/installer/powerpcspe/modules/powerpcspe/mouse-modules
deleted file mode 100644
index 15fcb00ea..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <mouse-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/multipath-modules b/debian/installer/powerpcspe/modules/powerpcspe/multipath-modules
deleted file mode 100644
index a8b69b253..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <multipath-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/nbd-modules b/debian/installer/powerpcspe/modules/powerpcspe/nbd-modules
deleted file mode 100644
index 3c9b3e5d4..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nbd-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/nic-extra-modules b/debian/installer/powerpcspe/modules/powerpcspe/nic-extra-modules
deleted file mode 100644
index 071e7b286..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/nic-extra-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <nic-extra-modules>
-
-tms380tr
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/nic-modules b/debian/installer/powerpcspe/modules/powerpcspe/nic-modules
deleted file mode 100644
index 71e9d72c8..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/nic-modules
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <nic-modules>
-
-ipddp
-sunhme
-sungem
-sungem_phy
-bmac ?
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/nic-pcmcia-modules b/debian/installer/powerpcspe/modules/powerpcspe/nic-pcmcia-modules
deleted file mode 100644
index 7a0702cd5..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/nic-pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nic-pcmcia-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules b/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules
deleted file mode 100644
index a6f274a44..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/nic-shared-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <nic-shared-modules>
-llc
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/pata-modules b/debian/installer/powerpcspe/modules/powerpcspe/pata-modules
deleted file mode 100644
index 4c7d4296b..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/pata-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <pata-modules>
-pata_mpc52xx ?
-pata_macio ?
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/pcmcia-modules b/debian/installer/powerpcspe/modules/powerpcspe/pcmcia-modules
deleted file mode 100644
index 2bb5350fe..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <pcmcia-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/pcmcia-storage-modules b/debian/installer/powerpcspe/modules/powerpcspe/pcmcia-storage-modules
deleted file mode 100644
index 9fbaff306..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/pcmcia-storage-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <pcmcia-storage-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/ppp-modules b/debian/installer/powerpcspe/modules/powerpcspe/ppp-modules
deleted file mode 100644
index f1ae9b3d1..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/ppp-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ppp-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/reiserfs-modules b/debian/installer/powerpcspe/modules/powerpcspe/reiserfs-modules
deleted file mode 100644
index 372669677..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/reiserfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <reiserfs-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/sata-modules b/debian/installer/powerpcspe/modules/powerpcspe/sata-modules
deleted file mode 100644
index 071cb860b..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/sata-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <sata-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/scsi-common-modules b/debian/installer/powerpcspe/modules/powerpcspe/scsi-common-modules
deleted file mode 100644
index 49739018c..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/scsi-common-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <scsi-common-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/scsi-core-modules b/debian/installer/powerpcspe/modules/powerpcspe/scsi-core-modules
deleted file mode 100644
index 6ec85bb77..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/scsi-core-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <scsi-core-modules>
-scsi_mod -
-scsi_transport_spi
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/scsi-extra-modules b/debian/installer/powerpcspe/modules/powerpcspe/scsi-extra-modules
deleted file mode 100644
index cd13edec5..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/scsi-extra-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <scsi-extra-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/scsi-modules b/debian/installer/powerpcspe/modules/powerpcspe/scsi-modules
deleted file mode 100644
index 091dcab21..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/scsi-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <scsi-modules>
-
-a100u2w
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/serial-modules b/debian/installer/powerpcspe/modules/powerpcspe/serial-modules
deleted file mode 100644
index 6ab8b8c35..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <serial-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/squashfs-modules b/debian/installer/powerpcspe/modules/powerpcspe/squashfs-modules
deleted file mode 100644
index 42d77887a..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <squashfs-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/udf-modules b/debian/installer/powerpcspe/modules/powerpcspe/udf-modules
deleted file mode 100644
index b90d7ee9b..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <udf-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/ufs-modules b/debian/installer/powerpcspe/modules/powerpcspe/ufs-modules
deleted file mode 100644
index 69745cad0..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/ufs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ufs-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/uinput-modules b/debian/installer/powerpcspe/modules/powerpcspe/uinput-modules
deleted file mode 100644
index 58a833779..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <uinput-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/usb-modules b/debian/installer/powerpcspe/modules/powerpcspe/usb-modules
deleted file mode 100644
index c598dedd8..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/usb-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <usb-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/usb-serial-modules b/debian/installer/powerpcspe/modules/powerpcspe/usb-serial-modules
deleted file mode 100644
index c0a0dc3bd..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <usb-serial-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/usb-storage-modules b/debian/installer/powerpcspe/modules/powerpcspe/usb-storage-modules
deleted file mode 100644
index 272d95e2e..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/usb-storage-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <usb-storage-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/virtio-modules b/debian/installer/powerpcspe/modules/powerpcspe/virtio-modules
deleted file mode 100644
index 61da39659..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <virtio-modules>
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/xfs-modules b/debian/installer/powerpcspe/modules/powerpcspe/xfs-modules
deleted file mode 100644
index c020b5d39..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/xfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <xfs-modules>
-
diff --git a/debian/installer/powerpcspe/modules/powerpcspe/zlib-modules b/debian/installer/powerpcspe/modules/powerpcspe/zlib-modules
deleted file mode 100644
index e02ad64bf..000000000
--- a/debian/installer/powerpcspe/modules/powerpcspe/zlib-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <zlib-modules>