Adding debian version 6.1.76-1.debian/6.1.76-1debian

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

820 files changed, 1644 insertions, 0 deletions

diff --git a/debian/installer/modules/acpi-modules b/debian/installer/modules/acpi-modules
new file mode 100644
index 000000000..d4723a10b
--- /dev/null
+++ b/debian/installer/modules/acpi-modules
@@ -0,0 +1,2 @@
+fan
+thermal
diff --git a/debian/installer/modules/affs-modules b/debian/installer/modules/affs-modules
new file mode 100644
index 000000000..ac2825911
--- /dev/null
+++ b/debian/installer/modules/affs-modules
@@ -0,0 +1 @@
+affs
diff --git a/debian/installer/modules/alpha-generic/ata-modules b/debian/installer/modules/alpha-generic/ata-modules
new file mode 100644
index 000000000..b81c0f38b
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/ata-modules
@@ -0,0 +1 @@
+#include <ata-modules>
diff --git a/debian/installer/modules/alpha-generic/btrfs-modules b/debian/installer/modules/alpha-generic/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/alpha-generic/cdrom-core-modules b/debian/installer/modules/alpha-generic/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/modules/alpha-generic/crc-modules b/debian/installer/modules/alpha-generic/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/alpha-generic/crypto-dm-modules b/debian/installer/modules/alpha-generic/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/alpha-generic/crypto-modules b/debian/installer/modules/alpha-generic/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/alpha-generic/event-modules b/debian/installer/modules/alpha-generic/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/alpha-generic/ext4-modules b/debian/installer/modules/alpha-generic/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/alpha-generic/f2fs-modules b/debian/installer/modules/alpha-generic/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/alpha-generic/fat-modules b/debian/installer/modules/alpha-generic/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/alpha-generic/fb-modules b/debian/installer/modules/alpha-generic/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>
diff --git a/debian/installer/modules/alpha-generic/fuse-modules b/debian/installer/modules/alpha-generic/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/alpha-generic/i2c-modules b/debian/installer/modules/alpha-generic/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/alpha-generic/input-modules b/debian/installer/modules/alpha-generic/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/alpha-generic/isofs-modules b/debian/installer/modules/alpha-generic/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/alpha-generic/jfs-modules b/debian/installer/modules/alpha-generic/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/alpha-generic/kernel-image b/debian/installer/modules/alpha-generic/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/alpha-generic/loop-modules b/debian/installer/modules/alpha-generic/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/alpha-generic/md-modules b/debian/installer/modules/alpha-generic/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/alpha-generic/mouse-modules b/debian/installer/modules/alpha-generic/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/alpha-generic/multipath-modules b/debian/installer/modules/alpha-generic/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/alpha-generic/nbd-modules b/debian/installer/modules/alpha-generic/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/alpha-generic/nic-modules b/debian/installer/modules/alpha-generic/nic-modules
new file mode 100644
index 000000000..2512e8395
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/nic-modules
@@ -0,0 +1 @@
+#include <nic-modules>
diff --git a/debian/installer/modules/alpha-generic/nic-pcmcia-modules b/debian/installer/modules/alpha-generic/nic-pcmcia-modules
new file mode 100644
index 000000000..7a0702cd5
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/nic-pcmcia-modules
@@ -0,0 +1 @@
+#include <nic-pcmcia-modules>
diff --git a/debian/installer/modules/alpha-generic/nic-shared-modules b/debian/installer/modules/alpha-generic/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/alpha-generic/nic-usb-modules b/debian/installer/modules/alpha-generic/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/alpha-generic/nic-wireless-modules b/debian/installer/modules/alpha-generic/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/alpha-generic/pata-modules b/debian/installer/modules/alpha-generic/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/alpha-generic/pcmcia-modules b/debian/installer/modules/alpha-generic/pcmcia-modules
new file mode 100644
index 000000000..2bb5350fe
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/pcmcia-modules
@@ -0,0 +1 @@
+#include <pcmcia-modules>
diff --git a/debian/installer/modules/alpha-generic/ppp-modules b/debian/installer/modules/alpha-generic/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/alpha-generic/sata-modules b/debian/installer/modules/alpha-generic/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/modules/alpha-generic/scsi-core-modules b/debian/installer/modules/alpha-generic/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/alpha-generic/scsi-modules b/debian/installer/modules/alpha-generic/scsi-modules
new file mode 100644
index 000000000..8909dfb79
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/scsi-modules
@@ -0,0 +1 @@
+#include <scsi-modules>
diff --git a/debian/installer/modules/alpha-generic/scsi-nic-modules b/debian/installer/modules/alpha-generic/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/alpha-generic/serial-modules b/debian/installer/modules/alpha-generic/serial-modules
new file mode 100644
index 000000000..6ab8b8c35
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/serial-modules
@@ -0,0 +1 @@
+#include <serial-modules>
diff --git a/debian/installer/modules/alpha-generic/squashfs-modules b/debian/installer/modules/alpha-generic/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/alpha-generic/srm-modules b/debian/installer/modules/alpha-generic/srm-modules
new file mode 100644
index 000000000..016011997
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/srm-modules
@@ -0,0 +1 @@
+srm_env
diff --git a/debian/installer/modules/alpha-generic/usb-modules b/debian/installer/modules/alpha-generic/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/alpha-generic/usb-serial-modules b/debian/installer/modules/alpha-generic/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/alpha-generic/usb-storage-modules b/debian/installer/modules/alpha-generic/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/modules/alpha-generic/xfs-modules b/debian/installer/modules/alpha-generic/xfs-modules
new file mode 100644
index 000000000..98374e2bb
--- /dev/null
+++ b/debian/installer/modules/alpha-generic/xfs-modules
@@ -0,0 +1 @@
+#include <xfs-modules>
diff --git a/debian/installer/modules/amd64/acpi-modules b/debian/installer/modules/amd64/acpi-modules
new file mode 100644
index 000000000..307528fb1
--- /dev/null
+++ b/debian/installer/modules/amd64/acpi-modules
@@ -0,0 +1,2 @@
+#include <acpi-modules>
+
diff --git a/debian/installer/modules/amd64/ata-modules b/debian/installer/modules/amd64/ata-modules
new file mode 100644
index 000000000..9409e7cde
--- /dev/null
+++ b/debian/installer/modules/amd64/ata-modules
@@ -0,0 +1,2 @@
+#include <ata-modules>
+
diff --git a/debian/installer/modules/amd64/btrfs-modules b/debian/installer/modules/amd64/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/amd64/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/amd64/cdrom-core-modules b/debian/installer/modules/amd64/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/amd64/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/amd64/crc-modules b/debian/installer/modules/amd64/crc-modules
new file mode 100644
index 000000000..191b9dfa8
--- /dev/null
+++ b/debian/installer/modules/amd64/crc-modules
@@ -0,0 +1,2 @@
+#include <crc-modules>
+crc32_pclmul
diff --git a/debian/installer/modules/amd64/crypto-dm-modules b/debian/installer/modules/amd64/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/amd64/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/amd64/crypto-modules b/debian/installer/modules/amd64/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/amd64/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/amd64/efi-modules b/debian/installer/modules/amd64/efi-modules
new file mode 100644
index 000000000..e1dc05e8f
--- /dev/null
+++ b/debian/installer/modules/amd64/efi-modules
@@ -0,0 +1 @@
+#include <efi-modules>
diff --git a/debian/installer/modules/amd64/event-modules b/debian/installer/modules/amd64/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/amd64/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/amd64/ext4-modules b/debian/installer/modules/amd64/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/amd64/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/amd64/f2fs-modules b/debian/installer/modules/amd64/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/amd64/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/amd64/fat-modules b/debian/installer/modules/amd64/fat-modules
new file mode 100644
index 000000000..cce8fd30c
--- /dev/null
+++ b/debian/installer/modules/amd64/fat-modules
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff --git a/debian/installer/modules/amd64/fb-modules b/debian/installer/modules/amd64/fb-modules
new file mode 100644
index 000000000..8e9892fea
--- /dev/null
+++ b/debian/installer/modules/amd64/fb-modules
@@ -0,0 +1,4 @@
+#include <fb-modules>
+
+vesafb ?
+vga16fb
diff --git a/debian/installer/modules/amd64/firewire-core-modules b/debian/installer/modules/amd64/firewire-core-modules
new file mode 100644
index 000000000..dcac80af9
--- /dev/null
+++ b/debian/installer/modules/amd64/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff --git a/debian/installer/modules/amd64/fuse-modules b/debian/installer/modules/amd64/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/amd64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/amd64/i2c-modules b/debian/installer/modules/amd64/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/amd64/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/amd64/input-modules b/debian/installer/modules/amd64/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/amd64/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/amd64/isofs-modules b/debian/installer/modules/amd64/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/amd64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/amd64/jfs-modules b/debian/installer/modules/amd64/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/amd64/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/amd64/kernel-image b/debian/installer/modules/amd64/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/amd64/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/amd64/loop-modules b/debian/installer/modules/amd64/loop-modules
new file mode 100644
index 000000000..164467713
--- /dev/null
+++ b/debian/installer/modules/amd64/loop-modules
@@ -0,0 +1,2 @@
+#include <loop-modules>
+
diff --git a/debian/installer/modules/amd64/md-modules b/debian/installer/modules/amd64/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/modules/amd64/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/modules/amd64/mmc-core-modules b/debian/installer/modules/amd64/mmc-core-modules
new file mode 100644
index 000000000..7bf38465c
--- /dev/null
+++ b/debian/installer/modules/amd64/mmc-core-modules
@@ -0,0 +1 @@
+#include <mmc-core-modules>
diff --git a/debian/installer/modules/amd64/mmc-modules b/debian/installer/modules/amd64/mmc-modules
new file mode 100644
index 000000000..dadfd5334
--- /dev/null
+++ b/debian/installer/modules/amd64/mmc-modules
@@ -0,0 +1 @@
+#include <mmc-modules>
diff --git a/debian/installer/modules/amd64/mouse-modules b/debian/installer/modules/amd64/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/amd64/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/amd64/mtd-core-modules b/debian/installer/modules/amd64/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/amd64/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/amd64/multipath-modules b/debian/installer/modules/amd64/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/amd64/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/amd64/nbd-modules b/debian/installer/modules/amd64/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/amd64/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/amd64/nic-modules b/debian/installer/modules/amd64/nic-modules
new file mode 100644
index 000000000..2512e8395
--- /dev/null
+++ b/debian/installer/modules/amd64/nic-modules
@@ -0,0 +1 @@
+#include <nic-modules>
diff --git a/debian/installer/modules/amd64/nic-pcmcia-modules b/debian/installer/modules/amd64/nic-pcmcia-modules
new file mode 100644
index 000000000..7a0702cd5
--- /dev/null
+++ b/debian/installer/modules/amd64/nic-pcmcia-modules
@@ -0,0 +1 @@
+#include <nic-pcmcia-modules>
diff --git a/debian/installer/modules/amd64/nic-shared-modules b/debian/installer/modules/amd64/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/amd64/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/amd64/nic-usb-modules b/debian/installer/modules/amd64/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/amd64/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/amd64/nic-wireless-modules b/debian/installer/modules/amd64/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/amd64/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/amd64/pata-modules b/debian/installer/modules/amd64/pata-modules
new file mode 100644
index 000000000..8c4e514ae
--- /dev/null
+++ b/debian/installer/modules/amd64/pata-modules
@@ -0,0 +1,2 @@
+#include <pata-modules>
+
diff --git a/debian/installer/modules/amd64/pcmcia-modules b/debian/installer/modules/amd64/pcmcia-modules
new file mode 100644
index 000000000..2bb5350fe
--- /dev/null
+++ b/debian/installer/modules/amd64/pcmcia-modules
@@ -0,0 +1 @@
+#include <pcmcia-modules>
diff --git a/debian/installer/modules/amd64/pcmcia-storage-modules b/debian/installer/modules/amd64/pcmcia-storage-modules
new file mode 100644
index 000000000..f73ae5bb9
--- /dev/null
+++ b/debian/installer/modules/amd64/pcmcia-storage-modules
@@ -0,0 +1 @@
+#include <pcmcia-storage-modules>
diff --git a/debian/installer/modules/amd64/ppp-modules b/debian/installer/modules/amd64/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/modules/amd64/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/modules/amd64/rfkill-modules b/debian/installer/modules/amd64/rfkill-modules
new file mode 100644
index 000000000..77a2245ce
--- /dev/null
+++ b/debian/installer/modules/amd64/rfkill-modules
@@ -0,0 +1 @@
+#include <rfkill-modules>
diff --git a/debian/installer/modules/amd64/sata-modules b/debian/installer/modules/amd64/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/modules/amd64/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/modules/amd64/scsi-core-modules b/debian/installer/modules/amd64/scsi-core-modules
new file mode 100644
index 000000000..778a022fa
--- /dev/null
+++ b/debian/installer/modules/amd64/scsi-core-modules
@@ -0,0 +1,4 @@
+#include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/debian/installer/modules/amd64/scsi-modules b/debian/installer/modules/amd64/scsi-modules
new file mode 100644
index 000000000..9b1fa27b9
--- /dev/null
+++ b/debian/installer/modules/amd64/scsi-modules
@@ -0,0 +1,3 @@
+#include <scsi-modules>
+# To support nvme
+vmd
diff --git a/debian/installer/modules/amd64/scsi-nic-modules b/debian/installer/modules/amd64/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/amd64/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/amd64/serial-modules b/debian/installer/modules/amd64/serial-modules
new file mode 100644
index 000000000..6ab8b8c35
--- /dev/null
+++ b/debian/installer/modules/amd64/serial-modules
@@ -0,0 +1 @@
+#include <serial-modules>
diff --git a/debian/installer/modules/amd64/sound-modules b/debian/installer/modules/amd64/sound-modules
new file mode 100644
index 000000000..68395ab3d
--- /dev/null
+++ b/debian/installer/modules/amd64/sound-modules
@@ -0,0 +1 @@
+#include <sound-modules>
diff --git a/debian/installer/modules/amd64/speakup-modules b/debian/installer/modules/amd64/speakup-modules
new file mode 100644
index 000000000..29592721a
--- /dev/null
+++ b/debian/installer/modules/amd64/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>
diff --git a/debian/installer/modules/amd64/squashfs-modules b/debian/installer/modules/amd64/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/amd64/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/amd64/udf-modules b/debian/installer/modules/amd64/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/amd64/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/amd64/uinput-modules b/debian/installer/modules/amd64/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/modules/amd64/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/modules/amd64/usb-modules b/debian/installer/modules/amd64/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/amd64/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/amd64/usb-serial-modules b/debian/installer/modules/amd64/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/amd64/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/amd64/usb-storage-modules b/debian/installer/modules/amd64/usb-storage-modules
new file mode 100644
index 000000000..272d95e2e
--- /dev/null
+++ b/debian/installer/modules/amd64/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff --git a/debian/installer/modules/amd64/xfs-modules b/debian/installer/modules/amd64/xfs-modules
new file mode 100644
index 000000000..c020b5d39
--- /dev/null
+++ b/debian/installer/modules/amd64/xfs-modules
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff --git a/debian/installer/modules/arm64/ata-modules b/debian/installer/modules/arm64/ata-modules
new file mode 100644
index 000000000..9409e7cde
--- /dev/null
+++ b/debian/installer/modules/arm64/ata-modules
@@ -0,0 +1,2 @@
+#include <ata-modules>
+
diff --git a/debian/installer/modules/arm64/btrfs-modules b/debian/installer/modules/arm64/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/arm64/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/arm64/cdrom-core-modules b/debian/installer/modules/arm64/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/arm64/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/arm64/crc-modules b/debian/installer/modules/arm64/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/arm64/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/arm64/crypto-dm-modules b/debian/installer/modules/arm64/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/arm64/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/arm64/crypto-modules b/debian/installer/modules/arm64/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/arm64/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/arm64/efi-modules b/debian/installer/modules/arm64/efi-modules
new file mode 100644
index 000000000..e1dc05e8f
--- /dev/null
+++ b/debian/installer/modules/arm64/efi-modules
@@ -0,0 +1 @@
+#include <efi-modules>
diff --git a/debian/installer/modules/arm64/event-modules b/debian/installer/modules/arm64/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/arm64/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/arm64/ext4-modules b/debian/installer/modules/arm64/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/arm64/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/arm64/f2fs-modules b/debian/installer/modules/arm64/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/arm64/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/arm64/fat-modules b/debian/installer/modules/arm64/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/arm64/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/arm64/fb-modules b/debian/installer/modules/arm64/fb-modules
new file mode 100644
index 000000000..f9bc179fe
--- /dev/null
+++ b/debian/installer/modules/arm64/fb-modules
@@ -0,0 +1,34 @@
+#include <fb-modules>
+
+ast
+tegra-drm
+rockchipdrm
+hibmc-drm
+
+# For panel/backlight on some chromeos devices
+panel-simple
+panel-edp
+pwm_bl
+pwm-cros-ec
+
+# For panel/backlight on Pinebook
+analogix-anx6345
+pwm-sun4i
+sun4i-drm
+sun8i-mixer
+
+# For panel/backlight on Pinebook Pro
+pwm-rockchip
+
+# For HDMI on some rockchip platforms (e.g. rock64-rk3328)
+nvmem-rockchip-efuse
+phy-rockchip-inno-hdmi
+
+# For panel/backlight on MNT Reform 2
+pwm-imx27
+nwl-dsi
+ti-sn65dsi86
+imx-dcss
+mxsfb
+mux-mmio
+imx8mq-interconnect
diff --git a/debian/installer/modules/arm64/fuse-modules b/debian/installer/modules/arm64/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/arm64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/arm64/i2c-modules b/debian/installer/modules/arm64/i2c-modules
new file mode 100644
index 000000000..6f839a7fc
--- /dev/null
+++ b/debian/installer/modules/arm64/i2c-modules
@@ -0,0 +1,5 @@
+#include <i2c-modules>
+i2c-tegra
+i2c-rk3x
+i2c-mv64xxx
+i2c-imx
diff --git a/debian/installer/modules/arm64/input-modules b/debian/installer/modules/arm64/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/arm64/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/arm64/isofs-modules b/debian/installer/modules/arm64/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/arm64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/arm64/jfs-modules b/debian/installer/modules/arm64/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/arm64/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/arm64/kernel-image b/debian/installer/modules/arm64/kernel-image
new file mode 100644
index 000000000..8a70e1912
--- /dev/null
+++ b/debian/installer/modules/arm64/kernel-image
@@ -0,0 +1,41 @@
+#include <kernel-image>
+
+# Multifunction devices
+drivers/mfd/**
+
+# Regulators
+drivers/regulator/**
+
+# NIC,sata, and USB on Armada 8K
+phy-mvebu-cp110-comphy ?
+
+# SoC modules
+drivers/soc/**
+
+# Watchdog needed for reboot
+sunxi_wdt ?
+imx2_wdt ?
+
+# For Turris MOX (u-boot enables the watchdog)
+armada_37xx_wdt ?
+
+# SPI devices
+drivers/spi/**
+
+# For cros_ec mfd device
+cros_ec_spi ?
+
+# PCIe PHYs
+phy-rockchip-pcie ?
+
+# For spi-rockchip
+pl330 ?
+
+# Regulator-SoC synchronization
+rockchip-io-domain ?
+
+# Pin controllers
+drivers/pinctrl/**
+
+# EFUSE/OTP drivers
+nvmem-imx-ocotp ?
diff --git a/debian/installer/modules/arm64/leds-modules b/debian/installer/modules/arm64/leds-modules
new file mode 100644
index 000000000..85d9f2565
--- /dev/null
+++ b/debian/installer/modules/arm64/leds-modules
@@ -0,0 +1 @@
+#include <leds-modules>
diff --git a/debian/installer/modules/arm64/loop-modules b/debian/installer/modules/arm64/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/arm64/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/arm64/md-modules b/debian/installer/modules/arm64/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/arm64/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/arm64/mmc-modules b/debian/installer/modules/arm64/mmc-modules
new file mode 100644
index 000000000..c9f12f3b9
--- /dev/null
+++ b/debian/installer/modules/arm64/mmc-modules
@@ -0,0 +1,3 @@
+#include <mmc-modules>
+
+phy-rockchip-emmc
diff --git a/debian/installer/modules/arm64/mtd-core-modules b/debian/installer/modules/arm64/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/arm64/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/arm64/multipath-modules b/debian/installer/modules/arm64/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/arm64/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/arm64/nbd-modules b/debian/installer/modules/arm64/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/arm64/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/arm64/nic-modules b/debian/installer/modules/arm64/nic-modules
new file mode 100644
index 000000000..863652ef7
--- /dev/null
+++ b/debian/installer/modules/arm64/nic-modules
@@ -0,0 +1,2 @@
+#include <nic-modules>
+mdio-bcm-unimac
diff --git a/debian/installer/modules/arm64/nic-shared-modules b/debian/installer/modules/arm64/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/arm64/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/arm64/nic-usb-modules b/debian/installer/modules/arm64/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/arm64/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/arm64/nic-wireless-modules b/debian/installer/modules/arm64/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/arm64/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/arm64/ppp-modules b/debian/installer/modules/arm64/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/arm64/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/arm64/sata-modules b/debian/installer/modules/arm64/sata-modules
new file mode 100644
index 000000000..740a93c36
--- /dev/null
+++ b/debian/installer/modules/arm64/sata-modules
@@ -0,0 +1,4 @@
+#include <sata-modules>
+phy-qcom-apq8064-sata
+phy-qcom-ipq806x-sata
+phy-xgene
diff --git a/debian/installer/modules/arm64/scsi-core-modules b/debian/installer/modules/arm64/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/arm64/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/arm64/scsi-modules b/debian/installer/modules/arm64/scsi-modules
new file mode 100644
index 000000000..8909dfb79
--- /dev/null
+++ b/debian/installer/modules/arm64/scsi-modules
@@ -0,0 +1 @@
+#include <scsi-modules>
diff --git a/debian/installer/modules/arm64/scsi-nic-modules b/debian/installer/modules/arm64/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/arm64/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/arm64/sound-modules b/debian/installer/modules/arm64/sound-modules
new file mode 100644
index 000000000..68395ab3d
--- /dev/null
+++ b/debian/installer/modules/arm64/sound-modules
@@ -0,0 +1 @@
+#include <sound-modules>
diff --git a/debian/installer/modules/arm64/speakup-modules b/debian/installer/modules/arm64/speakup-modules
new file mode 100644
index 000000000..29592721a
--- /dev/null
+++ b/debian/installer/modules/arm64/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>
diff --git a/debian/installer/modules/arm64/squashfs-modules b/debian/installer/modules/arm64/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/arm64/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/arm64/udf-modules b/debian/installer/modules/arm64/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/arm64/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/arm64/uinput-modules b/debian/installer/modules/arm64/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/modules/arm64/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/modules/arm64/usb-modules b/debian/installer/modules/arm64/usb-modules
new file mode 100644
index 000000000..2461e61f3
--- /dev/null
+++ b/debian/installer/modules/arm64/usb-modules
@@ -0,0 +1,11 @@
+#include <usb-modules>
+dwc2
+dwc3
+usb3503
+phy-rockchip-typec
+extcon-usbc-cros-ec
+
+# For USB-C on Pinebook Pro
+fusb302
+tcpm
+typec
diff --git a/debian/installer/modules/arm64/usb-serial-modules b/debian/installer/modules/arm64/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/arm64/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/arm64/usb-storage-modules b/debian/installer/modules/arm64/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/modules/arm64/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/modules/arm64/xfs-modules b/debian/installer/modules/arm64/xfs-modules
new file mode 100644
index 000000000..98374e2bb
--- /dev/null
+++ b/debian/installer/modules/arm64/xfs-modules
@@ -0,0 +1 @@
+#include <xfs-modules>
diff --git a/debian/installer/modules/armel-marvell/btrfs-modules b/debian/installer/modules/armel-marvell/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/armel-marvell/cdrom-core-modules b/debian/installer/modules/armel-marvell/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/armel-marvell/crc-modules b/debian/installer/modules/armel-marvell/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/armel-marvell/crypto-dm-modules b/debian/installer/modules/armel-marvell/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/armel-marvell/crypto-modules b/debian/installer/modules/armel-marvell/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/armel-marvell/event-modules b/debian/installer/modules/armel-marvell/event-modules
new file mode 100644
index 000000000..0bc9f776d
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/event-modules
@@ -0,0 +1,2 @@
+#include <event-modules>
+gpio_keys
diff --git a/debian/installer/modules/armel-marvell/ext4-modules b/debian/installer/modules/armel-marvell/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/armel-marvell/f2fs-modules b/debian/installer/modules/armel-marvell/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/armel-marvell/fat-modules b/debian/installer/modules/armel-marvell/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/armel-marvell/fb-modules b/debian/installer/modules/armel-marvell/fb-modules
new file mode 100644
index 000000000..701ee42c5
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/fb-modules
@@ -0,0 +1 @@
+udlfb
diff --git a/debian/installer/modules/armel-marvell/fuse-modules b/debian/installer/modules/armel-marvell/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/armel-marvell/input-modules b/debian/installer/modules/armel-marvell/input-modules
new file mode 100644
index 000000000..34183581c
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/input-modules
@@ -0,0 +1,3 @@
+#include <input-modules>
+# Moved to event-modules for use in network-console builds
+gpio_keys -
diff --git a/debian/installer/modules/armel-marvell/ipv6-modules b/debian/installer/modules/armel-marvell/ipv6-modules
new file mode 100644
index 000000000..1e3fc3388
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/ipv6-modules
@@ -0,0 +1 @@
+#include <ipv6-modules>
diff --git a/debian/installer/modules/armel-marvell/isofs-modules b/debian/installer/modules/armel-marvell/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/armel-marvell/jffs2-modules b/debian/installer/modules/armel-marvell/jffs2-modules
new file mode 100644
index 000000000..245c7d8a5
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/jffs2-modules
@@ -0,0 +1 @@
+#include <jffs2-modules>
diff --git a/debian/installer/modules/armel-marvell/jfs-modules b/debian/installer/modules/armel-marvell/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/armel-marvell/kernel-image b/debian/installer/modules/armel-marvell/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/armel-marvell/leds-modules b/debian/installer/modules/armel-marvell/leds-modules
new file mode 100644
index 000000000..b18bac13f
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/leds-modules
@@ -0,0 +1,2 @@
+leds-ns2
+leds-netxbig
diff --git a/debian/installer/modules/armel-marvell/loop-modules b/debian/installer/modules/armel-marvell/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/armel-marvell/md-modules b/debian/installer/modules/armel-marvell/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/armel-marvell/minix-modules b/debian/installer/modules/armel-marvell/minix-modules
new file mode 100644
index 000000000..82b984372
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/minix-modules
@@ -0,0 +1 @@
+#include <minix-modules>
diff --git a/debian/installer/modules/armel-marvell/mmc-core-modules b/debian/installer/modules/armel-marvell/mmc-core-modules
new file mode 100644
index 000000000..7bf38465c
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/mmc-core-modules
@@ -0,0 +1 @@
+#include <mmc-core-modules>
diff --git a/debian/installer/modules/armel-marvell/mmc-modules b/debian/installer/modules/armel-marvell/mmc-modules
new file mode 100644
index 000000000..e8c7b46f5
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/mmc-modules
@@ -0,0 +1,2 @@
+#include <mmc-modules>
+mvsdio
diff --git a/debian/installer/modules/armel-marvell/mouse-modules b/debian/installer/modules/armel-marvell/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/armel-marvell/mtd-core-modules b/debian/installer/modules/armel-marvell/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/armel-marvell/mtd-modules b/debian/installer/modules/armel-marvell/mtd-modules
new file mode 100644
index 000000000..be36016c9
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/mtd-modules
@@ -0,0 +1,12 @@
+#include <mtd-modules>
+spi-nor
+cfi_probe
+gen_probe
+jedec_probe
+nand
+orion_nand
+ofpart
+mtdblock
+physmap
+cmdlinepart
+spi-orion
diff --git a/debian/installer/modules/armel-marvell/multipath-modules b/debian/installer/modules/armel-marvell/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/armel-marvell/nbd-modules b/debian/installer/modules/armel-marvell/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/armel-marvell/nic-modules b/debian/installer/modules/armel-marvell/nic-modules
new file mode 100644
index 000000000..1a2cdb1fc
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/nic-modules
@@ -0,0 +1,2 @@
+mv643xx_eth
+mvmdio
diff --git a/debian/installer/modules/armel-marvell/nic-shared-modules b/debian/installer/modules/armel-marvell/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/armel-marvell/nic-usb-modules b/debian/installer/modules/armel-marvell/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/armel-marvell/ppp-modules b/debian/installer/modules/armel-marvell/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/modules/armel-marvell/sata-modules b/debian/installer/modules/armel-marvell/sata-modules
new file mode 100644
index 000000000..3adbfa16d
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/sata-modules
@@ -0,0 +1,2 @@
+ahci
+sata_mv
diff --git a/debian/installer/modules/armel-marvell/scsi-core-modules b/debian/installer/modules/armel-marvell/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/armel-marvell/squashfs-modules b/debian/installer/modules/armel-marvell/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/armel-marvell/udf-modules b/debian/installer/modules/armel-marvell/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/armel-marvell/uinput-modules b/debian/installer/modules/armel-marvell/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/modules/armel-marvell/usb-modules b/debian/installer/modules/armel-marvell/usb-modules
new file mode 100644
index 000000000..772c4afee
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/usb-modules
@@ -0,0 +1,2 @@
+#include <usb-modules>
+ehci-orion
diff --git a/debian/installer/modules/armel-marvell/usb-serial-modules b/debian/installer/modules/armel-marvell/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/armel-marvell/usb-storage-modules b/debian/installer/modules/armel-marvell/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/modules/armel-marvell/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/modules/armhf-armmp/ata-modules b/debian/installer/modules/armhf-armmp/ata-modules
new file mode 100644
index 000000000..04d9c8841
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/ata-modules
@@ -0,0 +1 @@
+libata
diff --git a/debian/installer/modules/armhf-armmp/btrfs-modules b/debian/installer/modules/armhf-armmp/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/armhf-armmp/cdrom-core-modules b/debian/installer/modules/armhf-armmp/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/modules/armhf-armmp/crc-modules b/debian/installer/modules/armhf-armmp/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/armhf-armmp/crypto-dm-modules b/debian/installer/modules/armhf-armmp/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/armhf-armmp/crypto-modules b/debian/installer/modules/armhf-armmp/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/armhf-armmp/efi-modules b/debian/installer/modules/armhf-armmp/efi-modules
new file mode 100644
index 000000000..e1dc05e8f
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/efi-modules
@@ -0,0 +1 @@
+#include <efi-modules>
diff --git a/debian/installer/modules/armhf-armmp/event-modules b/debian/installer/modules/armhf-armmp/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/armhf-armmp/ext4-modules b/debian/installer/modules/armhf-armmp/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/armhf-armmp/f2fs-modules b/debian/installer/modules/armhf-armmp/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/armhf-armmp/fat-modules b/debian/installer/modules/armhf-armmp/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/armhf-armmp/fb-modules b/debian/installer/modules/armhf-armmp/fb-modules
new file mode 100644
index 000000000..f3d4b2a64
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/fb-modules
@@ -0,0 +1,5 @@
+#include <fb-modules>
+
+imxdrm
+dw_hdmi-imx
+tegra-drm
diff --git a/debian/installer/modules/armhf-armmp/fuse-modules b/debian/installer/modules/armhf-armmp/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/armhf-armmp/i2c-modules b/debian/installer/modules/armhf-armmp/i2c-modules
new file mode 100644
index 000000000..5690c2f51
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/i2c-modules
@@ -0,0 +1,5 @@
+#include <i2c-modules>
+i2c-exynos5
+i2c-mv64xxx
+i2c-rk3x
+
diff --git a/debian/installer/modules/armhf-armmp/input-modules b/debian/installer/modules/armhf-armmp/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/armhf-armmp/isofs-modules b/debian/installer/modules/armhf-armmp/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/armhf-armmp/jfs-modules b/debian/installer/modules/armhf-armmp/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/armhf-armmp/kernel-image b/debian/installer/modules/armhf-armmp/kernel-image
new file mode 100644
index 000000000..c089d9a23
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/kernel-image
@@ -0,0 +1,27 @@
+#include <kernel-image>
+
+# Clocks
+clk-palmas ?
+clk-s2mps11 ?
+clk-twl6040 ?
+
+# GPIO
+gpio-da9052 ?
+gpio-pca953x ?
+gpio-mxc ?
+
+# PCIe PHYs
+phy-omap-control ?
+phy-ti-pipe3 ?
+
+# Regulators
+drivers/regulator/**
+
+# Powersupply
+axp20x_usb_power ?
+
+# Watchdog needed for reboot
+sunxi_wdt ?
+
+# Regulator-SoC synchronization
+rockchip-io-domain ?
diff --git a/debian/installer/modules/armhf-armmp/leds-modules b/debian/installer/modules/armhf-armmp/leds-modules
new file mode 100644
index 000000000..85d9f2565
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/leds-modules
@@ -0,0 +1 @@
+#include <leds-modules>
diff --git a/debian/installer/modules/armhf-armmp/loop-modules b/debian/installer/modules/armhf-armmp/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/armhf-armmp/md-modules b/debian/installer/modules/armhf-armmp/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/armhf-armmp/mmc-modules b/debian/installer/modules/armhf-armmp/mmc-modules
new file mode 100644
index 000000000..dadfd5334
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/mmc-modules
@@ -0,0 +1 @@
+#include <mmc-modules>
diff --git a/debian/installer/modules/armhf-armmp/mtd-modules b/debian/installer/modules/armhf-armmp/mtd-modules
new file mode 100644
index 000000000..fb81032ea
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/mtd-modules
@@ -0,0 +1,3 @@
+#include <mtd-modules>
+mxc_nand
+marvell_nand
diff --git a/debian/installer/modules/armhf-armmp/multipath-modules b/debian/installer/modules/armhf-armmp/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/armhf-armmp/nbd-modules b/debian/installer/modules/armhf-armmp/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/armhf-armmp/nic-modules b/debian/installer/modules/armhf-armmp/nic-modules
new file mode 100644
index 000000000..2f94f2d83
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/nic-modules
@@ -0,0 +1,14 @@
+#include <nic-modules>
+mvneta
+mvmdio
+smsc911x
+stmmac
+stmmac-platform
+dwmac-generic
+dwmac-altr-socfpga
+dwmac-sunxi
+sun4i-emac
+xgmac
+ti_cpsw
+davinci_mdio
+mdio-aspeed
diff --git a/debian/installer/modules/armhf-armmp/nic-shared-modules b/debian/installer/modules/armhf-armmp/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/armhf-armmp/nic-usb-modules b/debian/installer/modules/armhf-armmp/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/armhf-armmp/nic-wireless-modules b/debian/installer/modules/armhf-armmp/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/armhf-armmp/pata-modules b/debian/installer/modules/armhf-armmp/pata-modules
new file mode 100644
index 000000000..2ff7276d4
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/pata-modules
@@ -0,0 +1 @@
+pata_imx
diff --git a/debian/installer/modules/armhf-armmp/ppp-modules b/debian/installer/modules/armhf-armmp/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/armhf-armmp/sata-modules b/debian/installer/modules/armhf-armmp/sata-modules
new file mode 100644
index 000000000..8e7e1ed2c
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/sata-modules
@@ -0,0 +1,5 @@
+#include <sata-modules>
+sata_highbank
+
+# SATA PHYs
+phy-exynos5250-sata
diff --git a/debian/installer/modules/armhf-armmp/scsi-core-modules b/debian/installer/modules/armhf-armmp/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/armhf-armmp/scsi-modules b/debian/installer/modules/armhf-armmp/scsi-modules
new file mode 100644
index 000000000..675462a14
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/scsi-modules
@@ -0,0 +1,2 @@
+#include <scsi-modules>
+
diff --git a/debian/installer/modules/armhf-armmp/scsi-nic-modules b/debian/installer/modules/armhf-armmp/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/armhf-armmp/sound-modules b/debian/installer/modules/armhf-armmp/sound-modules
new file mode 100644
index 000000000..68395ab3d
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/sound-modules
@@ -0,0 +1 @@
+#include <sound-modules>
diff --git a/debian/installer/modules/armhf-armmp/speakup-modules b/debian/installer/modules/armhf-armmp/speakup-modules
new file mode 100644
index 000000000..29592721a
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>
diff --git a/debian/installer/modules/armhf-armmp/squashfs-modules b/debian/installer/modules/armhf-armmp/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/armhf-armmp/udf-modules b/debian/installer/modules/armhf-armmp/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/armhf-armmp/uinput-modules b/debian/installer/modules/armhf-armmp/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/modules/armhf-armmp/usb-modules b/debian/installer/modules/armhf-armmp/usb-modules
new file mode 100644
index 000000000..5917b7f79
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/usb-modules
@@ -0,0 +1,4 @@
+#include <usb-modules>
+omap-ocp2scp
+extcon-usb-gpio
+usb3503
diff --git a/debian/installer/modules/armhf-armmp/usb-serial-modules b/debian/installer/modules/armhf-armmp/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/armhf-armmp/usb-storage-modules b/debian/installer/modules/armhf-armmp/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/modules/armhf-armmp/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/modules/ata-modules b/debian/installer/modules/ata-modules
new file mode 100644
index 000000000..6ca33ce0a
--- /dev/null
+++ b/debian/installer/modules/ata-modules
@@ -0,0 +1,2 @@
+libata
+ata_generic
diff --git a/debian/installer/modules/btrfs-modules b/debian/installer/modules/btrfs-modules
new file mode 100644
index 000000000..00531f654
--- /dev/null
+++ b/debian/installer/modules/btrfs-modules
@@ -0,0 +1 @@
+btrfs
diff --git a/debian/installer/modules/cdrom-core-modules b/debian/installer/modules/cdrom-core-modules
new file mode 100644
index 000000000..62e5e83a3
--- /dev/null
+++ b/debian/installer/modules/cdrom-core-modules
@@ -0,0 +1,2 @@
+cdrom ?
+sr_mod ?
diff --git a/debian/installer/modules/crc-modules b/debian/installer/modules/crc-modules
new file mode 100644
index 000000000..570736057
--- /dev/null
+++ b/debian/installer/modules/crc-modules
@@ -0,0 +1,8 @@
+crc-ccitt
+libcrc32c
+crc32_generic
+crc32c_generic
+crc-itu-t
+crc16
+crc7 ?
+crc64 ?
diff --git a/debian/installer/modules/crypto-dm-modules b/debian/installer/modules/crypto-dm-modules
new file mode 100644
index 000000000..189131fc1
--- /dev/null
+++ b/debian/installer/modules/crypto-dm-modules
@@ -0,0 +1 @@
+dm-crypt
diff --git a/debian/installer/modules/crypto-modules b/debian/installer/modules/crypto-modules
new file mode 100644
index 000000000..26ea3bdd0
--- /dev/null
+++ b/debian/installer/modules/crypto-modules
@@ -0,0 +1,16 @@
+aes_generic
+blowfish_generic
+twofish_generic
+serpent_generic
+sha256_generic
+arc4 ?
+cbc ?
+ccm
+ctr
+ecb
+xts
+michael_mic
+
+# For cryptsetup
+algif_skcipher
+essiv
diff --git a/debian/installer/modules/efi-modules b/debian/installer/modules/efi-modules
new file mode 100644
index 000000000..f9ec24485
--- /dev/null
+++ b/debian/installer/modules/efi-modules
@@ -0,0 +1 @@
+efivarfs
diff --git a/debian/installer/modules/event-modules b/debian/installer/modules/event-modules
new file mode 100644
index 000000000..97a5e58aa
--- /dev/null
+++ b/debian/installer/modules/event-modules
@@ -0,0 +1 @@
+evdev
diff --git a/debian/installer/modules/ext4-modules b/debian/installer/modules/ext4-modules
new file mode 100644
index 000000000..610034258
--- /dev/null
+++ b/debian/installer/modules/ext4-modules
@@ -0,0 +1,2 @@
+ext4
+jbd2
diff --git a/debian/installer/modules/f2fs-modules b/debian/installer/modules/f2fs-modules
new file mode 100644
index 000000000..08e5e7fa1
--- /dev/null
+++ b/debian/installer/modules/f2fs-modules
@@ -0,0 +1 @@
+f2fs
diff --git a/debian/installer/modules/fat-modules b/debian/installer/modules/fat-modules
new file mode 100644
index 000000000..0498cf834
--- /dev/null
+++ b/debian/installer/modules/fat-modules
@@ -0,0 +1,6 @@
+fat ?
+vfat
+# the default codepage for fat (as of 2.6.8)
+nls_cp437 ?
+# the default i/o character set for fat (as of 4.7.2-1)
+nls_ascii ?
diff --git a/debian/installer/modules/fb-modules b/debian/installer/modules/fb-modules
new file mode 100644
index 000000000..f17b6e6ae
--- /dev/null
+++ b/debian/installer/modules/fb-modules
@@ -0,0 +1,6 @@
+# We don't include all DRM drivers here as on many platforms we can
+# call system firmware to get hold of a simple framebuffer
+
+drm
+drm_kms_helper
+virtio-gpu ?
diff --git a/debian/installer/modules/firewire-core-modules b/debian/installer/modules/firewire-core-modules
new file mode 100644
index 000000000..bcc31d50a
--- /dev/null
+++ b/debian/installer/modules/firewire-core-modules
@@ -0,0 +1,3 @@
+firewire-core
+firewire-ohci
+firewire-sbp2
diff --git a/debian/installer/modules/fuse-modules b/debian/installer/modules/fuse-modules
new file mode 100644
index 000000000..a517c488f
--- /dev/null
+++ b/debian/installer/modules/fuse-modules
@@ -0,0 +1 @@
+fuse
diff --git a/debian/installer/modules/hfs-modules b/debian/installer/modules/hfs-modules
new file mode 100644
index 000000000..4a311558e
--- /dev/null
+++ b/debian/installer/modules/hfs-modules
@@ -0,0 +1,2 @@
+hfs
+hfsplus
diff --git a/debian/installer/modules/hppa-parisc64/ata-modules b/debian/installer/modules/hppa-parisc64/ata-modules
new file mode 100644
index 000000000..08f295ad2
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/ata-modules
@@ -0,0 +1 @@
+#include "../hppa/ata-modules"
diff --git a/debian/installer/modules/hppa-parisc64/btrfs-modules b/debian/installer/modules/hppa-parisc64/btrfs-modules
new file mode 100644
index 000000000..677b351f7
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/btrfs-modules
@@ -0,0 +1 @@
+#include "../hppa/btrfs-modules"
diff --git a/debian/installer/modules/hppa-parisc64/cdrom-core-modules b/debian/installer/modules/hppa-parisc64/cdrom-core-modules
new file mode 100644
index 000000000..9656269be
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/cdrom-core-modules
@@ -0,0 +1 @@
+#include "../hppa/cdrom-core-modules"
diff --git a/debian/installer/modules/hppa-parisc64/crc-modules b/debian/installer/modules/hppa-parisc64/crc-modules
new file mode 100644
index 000000000..f75e86b30
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/crc-modules
@@ -0,0 +1 @@
+#include "../hppa/crc-modules"
diff --git a/debian/installer/modules/hppa-parisc64/crypto-dm-modules b/debian/installer/modules/hppa-parisc64/crypto-dm-modules
new file mode 100644
index 000000000..ed740a551
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/crypto-dm-modules
@@ -0,0 +1 @@
+#include "../hppa/crypto-dm-modules"
diff --git a/debian/installer/modules/hppa-parisc64/crypto-modules b/debian/installer/modules/hppa-parisc64/crypto-modules
new file mode 100644
index 000000000..1c4d2d0cf
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/crypto-modules
@@ -0,0 +1 @@
+#include "../hppa/crypto-modules"
diff --git a/debian/installer/modules/hppa-parisc64/event-modules b/debian/installer/modules/hppa-parisc64/event-modules
new file mode 100644
index 000000000..1a5cbb04a
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/event-modules
@@ -0,0 +1 @@
+#include "../hppa/event-modules"
diff --git a/debian/installer/modules/hppa-parisc64/ext4-modules b/debian/installer/modules/hppa-parisc64/ext4-modules
new file mode 100644
index 000000000..00920ace1
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/ext4-modules
@@ -0,0 +1 @@
+#include "../hppa/ext4-modules"
diff --git a/debian/installer/modules/hppa-parisc64/f2fs-modules b/debian/installer/modules/hppa-parisc64/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/hppa-parisc64/fat-modules b/debian/installer/modules/hppa-parisc64/fat-modules
new file mode 100644
index 000000000..ef6dd33ff
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/fat-modules
@@ -0,0 +1 @@
+#include "../hppa/fat-modules"
diff --git a/debian/installer/modules/hppa-parisc64/fb-modules b/debian/installer/modules/hppa-parisc64/fb-modules
new file mode 100644
index 000000000..d0424dc9f
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/fb-modules
@@ -0,0 +1,4 @@
+#include <fb-modules>
+
+radeon ?
+ttm ?
diff --git a/debian/installer/modules/hppa-parisc64/fuse-modules b/debian/installer/modules/hppa-parisc64/fuse-modules
new file mode 100644
index 000000000..06f8ccf63
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/fuse-modules
@@ -0,0 +1 @@
+#include "../hppa/fuse-modules"
diff --git a/debian/installer/modules/hppa-parisc64/input-modules b/debian/installer/modules/hppa-parisc64/input-modules
new file mode 100644
index 000000000..cdeaa30fe
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/input-modules
@@ -0,0 +1 @@
+#include "../hppa/input-modules"
diff --git a/debian/installer/modules/hppa-parisc64/isofs-modules b/debian/installer/modules/hppa-parisc64/isofs-modules
new file mode 100644
index 000000000..9e8e2dfb1
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/isofs-modules
@@ -0,0 +1 @@
+#include "../hppa/isofs-modules"
diff --git a/debian/installer/modules/hppa-parisc64/jfs-modules b/debian/installer/modules/hppa-parisc64/jfs-modules
new file mode 100644
index 000000000..a3b6beb7d
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/jfs-modules
@@ -0,0 +1 @@
+#include "../hppa/jfs-modules"
diff --git a/debian/installer/modules/hppa-parisc64/kernel-image b/debian/installer/modules/hppa-parisc64/kernel-image
new file mode 100644
index 000000000..93d59f539
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/kernel-image
@@ -0,0 +1 @@
+#include "../hppa/kernel-image"
diff --git a/debian/installer/modules/hppa-parisc64/loop-modules b/debian/installer/modules/hppa-parisc64/loop-modules
new file mode 100644
index 000000000..721ffecf4
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/loop-modules
@@ -0,0 +1 @@
+#include "../hppa/loop-modules"
diff --git a/debian/installer/modules/hppa-parisc64/md-modules b/debian/installer/modules/hppa-parisc64/md-modules
new file mode 100644
index 000000000..d7e972022
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/md-modules
@@ -0,0 +1 @@
+#include "../hppa/md-modules"
diff --git a/debian/installer/modules/hppa-parisc64/mouse-modules b/debian/installer/modules/hppa-parisc64/mouse-modules
new file mode 100644
index 000000000..f9edf83b0
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/mouse-modules
@@ -0,0 +1 @@
+#include "../hppa/mouse-modules"
diff --git a/debian/installer/modules/hppa-parisc64/multipath-modules b/debian/installer/modules/hppa-parisc64/multipath-modules
new file mode 100644
index 000000000..46f68a37a
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/multipath-modules
@@ -0,0 +1 @@
+#include "../hppa/multipath-modules"
diff --git a/debian/installer/modules/hppa-parisc64/nbd-modules b/debian/installer/modules/hppa-parisc64/nbd-modules
new file mode 100644
index 000000000..b4c4622c7
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/nbd-modules
@@ -0,0 +1 @@
+#include "../hppa/nbd-modules"
diff --git a/debian/installer/modules/hppa-parisc64/nic-modules b/debian/installer/modules/hppa-parisc64/nic-modules
new file mode 100644
index 000000000..e15b2d573
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/nic-modules
@@ -0,0 +1 @@
+#include "../hppa/nic-modules"
diff --git a/debian/installer/modules/hppa-parisc64/nic-shared-modules b/debian/installer/modules/hppa-parisc64/nic-shared-modules
new file mode 100644
index 000000000..fd0b19c80
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/nic-shared-modules
@@ -0,0 +1 @@
+#include "../hppa/nic-shared-modules"
diff --git a/debian/installer/modules/hppa-parisc64/nic-usb-modules b/debian/installer/modules/hppa-parisc64/nic-usb-modules
new file mode 100644
index 000000000..261192d2e
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/nic-usb-modules
@@ -0,0 +1 @@
+#include "../hppa/nic-usb-modules"
diff --git a/debian/installer/modules/hppa-parisc64/pata-modules b/debian/installer/modules/hppa-parisc64/pata-modules
new file mode 100644
index 000000000..46bc71900
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/pata-modules
@@ -0,0 +1 @@
+#include "../hppa/pata-modules"
diff --git a/debian/installer/modules/hppa-parisc64/ppp-modules b/debian/installer/modules/hppa-parisc64/ppp-modules
new file mode 100644
index 000000000..b78085c34
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/ppp-modules
@@ -0,0 +1 @@
+#include "../hppa/ppp-modules"
diff --git a/debian/installer/modules/hppa-parisc64/sata-modules b/debian/installer/modules/hppa-parisc64/sata-modules
new file mode 100644
index 000000000..a2ebc2983
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/sata-modules
@@ -0,0 +1 @@
+#include "../hppa/sata-modules"
diff --git a/debian/installer/modules/hppa-parisc64/scsi-core-modules b/debian/installer/modules/hppa-parisc64/scsi-core-modules
new file mode 100644
index 000000000..ff84a7089
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/scsi-core-modules
@@ -0,0 +1 @@
+#include "../hppa/scsi-core-modules"
diff --git a/debian/installer/modules/hppa-parisc64/scsi-modules b/debian/installer/modules/hppa-parisc64/scsi-modules
new file mode 100644
index 000000000..229e060a8
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/scsi-modules
@@ -0,0 +1 @@
+#include "../hppa/scsi-modules"
diff --git a/debian/installer/modules/hppa-parisc64/serial-modules b/debian/installer/modules/hppa-parisc64/serial-modules
new file mode 100644
index 000000000..a84a550e8
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/serial-modules
@@ -0,0 +1 @@
+#include "../hppa/serial-modules"
diff --git a/debian/installer/modules/hppa-parisc64/squashfs-modules b/debian/installer/modules/hppa-parisc64/squashfs-modules
new file mode 100644
index 000000000..f0c79aa4e
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/squashfs-modules
@@ -0,0 +1 @@
+#include "../hppa/squashfs-modules"
diff --git a/debian/installer/modules/hppa-parisc64/usb-modules b/debian/installer/modules/hppa-parisc64/usb-modules
new file mode 100644
index 000000000..df2abbbd9
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/usb-modules
@@ -0,0 +1 @@
+#include "../hppa/usb-modules"
diff --git a/debian/installer/modules/hppa-parisc64/usb-serial-modules b/debian/installer/modules/hppa-parisc64/usb-serial-modules
new file mode 100644
index 000000000..1dd05036f
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/usb-serial-modules
@@ -0,0 +1 @@
+#include "../hppa/usb-serial-modules"
diff --git a/debian/installer/modules/hppa-parisc64/usb-storage-modules b/debian/installer/modules/hppa-parisc64/usb-storage-modules
new file mode 100644
index 000000000..5562ed4c8
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/usb-storage-modules
@@ -0,0 +1 @@
+#include "../hppa/usb-storage-modules"
diff --git a/debian/installer/modules/hppa-parisc64/xfs-modules b/debian/installer/modules/hppa-parisc64/xfs-modules
new file mode 100644
index 000000000..7960e0bb2
--- /dev/null
+++ b/debian/installer/modules/hppa-parisc64/xfs-modules
@@ -0,0 +1 @@
+#include "../hppa/xfs-modules"
diff --git a/debian/installer/modules/hppa/ata-modules b/debian/installer/modules/hppa/ata-modules
new file mode 100644
index 000000000..b81c0f38b
--- /dev/null
+++ b/debian/installer/modules/hppa/ata-modules
@@ -0,0 +1 @@
+#include <ata-modules>
diff --git a/debian/installer/modules/hppa/btrfs-modules b/debian/installer/modules/hppa/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/hppa/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/hppa/cdrom-core-modules b/debian/installer/modules/hppa/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/hppa/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/hppa/crc-modules b/debian/installer/modules/hppa/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/hppa/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/hppa/crypto-dm-modules b/debian/installer/modules/hppa/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/hppa/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/hppa/crypto-modules b/debian/installer/modules/hppa/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/hppa/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/hppa/event-modules b/debian/installer/modules/hppa/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/hppa/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/hppa/ext4-modules b/debian/installer/modules/hppa/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/hppa/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/hppa/f2fs-modules b/debian/installer/modules/hppa/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/hppa/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/hppa/fat-modules b/debian/installer/modules/hppa/fat-modules
new file mode 100644
index 000000000..cce8fd30c
--- /dev/null
+++ b/debian/installer/modules/hppa/fat-modules
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff --git a/debian/installer/modules/hppa/fuse-modules b/debian/installer/modules/hppa/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/hppa/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/hppa/i2c-modules b/debian/installer/modules/hppa/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/hppa/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/hppa/input-modules b/debian/installer/modules/hppa/input-modules
new file mode 100644
index 000000000..9d4cbf6fa
--- /dev/null
+++ b/debian/installer/modules/hppa/input-modules
@@ -0,0 +1,6 @@
+#include <input-modules>
+hil_kbd ?
+hilkbd ?
+hp_sdc_mlc ?
+hil_mlc ?
+hp_sdc ?
diff --git a/debian/installer/modules/hppa/isofs-modules b/debian/installer/modules/hppa/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/hppa/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/hppa/jfs-modules b/debian/installer/modules/hppa/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/hppa/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/hppa/kernel-image b/debian/installer/modules/hppa/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/hppa/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/hppa/loop-modules b/debian/installer/modules/hppa/loop-modules
new file mode 100644
index 000000000..164467713
--- /dev/null
+++ b/debian/installer/modules/hppa/loop-modules
@@ -0,0 +1,2 @@
+#include <loop-modules>
+
diff --git a/debian/installer/modules/hppa/md-modules b/debian/installer/modules/hppa/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/modules/hppa/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/modules/hppa/mouse-modules b/debian/installer/modules/hppa/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/hppa/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/hppa/multipath-modules b/debian/installer/modules/hppa/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/hppa/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/hppa/nbd-modules b/debian/installer/modules/hppa/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/hppa/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/hppa/nic-modules b/debian/installer/modules/hppa/nic-modules
new file mode 100644
index 000000000..8a4b656c9
--- /dev/null
+++ b/debian/installer/modules/hppa/nic-modules
@@ -0,0 +1,4 @@
+lasi_82596
+tg3
+tulip
+e1000
diff --git a/debian/installer/modules/hppa/nic-shared-modules b/debian/installer/modules/hppa/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/hppa/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/hppa/nic-usb-modules b/debian/installer/modules/hppa/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/hppa/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/hppa/pata-modules b/debian/installer/modules/hppa/pata-modules
new file mode 100644
index 000000000..8c4e514ae
--- /dev/null
+++ b/debian/installer/modules/hppa/pata-modules
@@ -0,0 +1,2 @@
+#include <pata-modules>
+
diff --git a/debian/installer/modules/hppa/ppp-modules b/debian/installer/modules/hppa/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/modules/hppa/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/modules/hppa/sata-modules b/debian/installer/modules/hppa/sata-modules
new file mode 100644
index 000000000..071cb860b
--- /dev/null
+++ b/debian/installer/modules/hppa/sata-modules
@@ -0,0 +1,2 @@
+#include <sata-modules>
+
diff --git a/debian/installer/modules/hppa/scsi-core-modules b/debian/installer/modules/hppa/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/hppa/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/hppa/scsi-modules b/debian/installer/modules/hppa/scsi-modules
new file mode 100644
index 000000000..8f289efb8
--- /dev/null
+++ b/debian/installer/modules/hppa/scsi-modules
@@ -0,0 +1,18 @@
+aic79xx
+aic7xxx
+BusLogic ?
+sym53c8xx
+sym53c8xx_2 ?
+53c700
+ch
+lasi700
+sg
+st
+zalon7xx
+megaraid ?
+megaraid_mbox ?
+megaraid_mm ?
+megaraid_sas ?
+qlogicfas408
+mptbase
+mptspi
diff --git a/debian/installer/modules/hppa/serial-modules b/debian/installer/modules/hppa/serial-modules
new file mode 100644
index 000000000..6ab8b8c35
--- /dev/null
+++ b/debian/installer/modules/hppa/serial-modules
@@ -0,0 +1 @@
+#include <serial-modules>
diff --git a/debian/installer/modules/hppa/squashfs-modules b/debian/installer/modules/hppa/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/hppa/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/hppa/usb-modules b/debian/installer/modules/hppa/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/hppa/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/hppa/usb-serial-modules b/debian/installer/modules/hppa/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/hppa/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/hppa/usb-storage-modules b/debian/installer/modules/hppa/usb-storage-modules
new file mode 100644
index 000000000..272d95e2e
--- /dev/null
+++ b/debian/installer/modules/hppa/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff --git a/debian/installer/modules/hppa/xfs-modules b/debian/installer/modules/hppa/xfs-modules
new file mode 100644
index 000000000..98374e2bb
--- /dev/null
+++ b/debian/installer/modules/hppa/xfs-modules
@@ -0,0 +1 @@
+#include <xfs-modules>
diff --git a/debian/installer/modules/i2c-modules b/debian/installer/modules/i2c-modules
new file mode 100644
index 000000000..0c4999fa7
--- /dev/null
+++ b/debian/installer/modules/i2c-modules
@@ -0,0 +1,3 @@
+i2c-core
+i2c-algo-bit
+i2c-designware-platform ?
diff --git a/debian/installer/modules/i386/acpi-modules b/debian/installer/modules/i386/acpi-modules
new file mode 100644
index 000000000..307528fb1
--- /dev/null
+++ b/debian/installer/modules/i386/acpi-modules
@@ -0,0 +1,2 @@
+#include <acpi-modules>
+
diff --git a/debian/installer/modules/i386/ata-modules b/debian/installer/modules/i386/ata-modules
new file mode 100644
index 000000000..9409e7cde
--- /dev/null
+++ b/debian/installer/modules/i386/ata-modules
@@ -0,0 +1,2 @@
+#include <ata-modules>
+
diff --git a/debian/installer/modules/i386/btrfs-modules b/debian/installer/modules/i386/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/i386/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/i386/cdrom-core-modules b/debian/installer/modules/i386/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/i386/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/i386/crc-modules b/debian/installer/modules/i386/crc-modules
new file mode 100644
index 000000000..191b9dfa8
--- /dev/null
+++ b/debian/installer/modules/i386/crc-modules
@@ -0,0 +1,2 @@
+#include <crc-modules>
+crc32_pclmul
diff --git a/debian/installer/modules/i386/crypto-dm-modules b/debian/installer/modules/i386/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/i386/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/i386/crypto-modules b/debian/installer/modules/i386/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/i386/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/i386/efi-modules b/debian/installer/modules/i386/efi-modules
new file mode 100644
index 000000000..e1dc05e8f
--- /dev/null
+++ b/debian/installer/modules/i386/efi-modules
@@ -0,0 +1 @@
+#include <efi-modules>
diff --git a/debian/installer/modules/i386/event-modules b/debian/installer/modules/i386/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/i386/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/i386/ext4-modules b/debian/installer/modules/i386/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/i386/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/i386/f2fs-modules b/debian/installer/modules/i386/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/i386/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/i386/fat-modules b/debian/installer/modules/i386/fat-modules
new file mode 100644
index 000000000..cce8fd30c
--- /dev/null
+++ b/debian/installer/modules/i386/fat-modules
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff --git a/debian/installer/modules/i386/fb-modules b/debian/installer/modules/i386/fb-modules
new file mode 100644
index 000000000..9602502af
--- /dev/null
+++ b/debian/installer/modules/i386/fb-modules
@@ -0,0 +1,6 @@
+#include <fb-modules>
+
+lxfb ?
+vesafb ?
+vga16fb
+viafb
diff --git a/debian/installer/modules/i386/firewire-core-modules b/debian/installer/modules/i386/firewire-core-modules
new file mode 100644
index 000000000..dcac80af9
--- /dev/null
+++ b/debian/installer/modules/i386/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff --git a/debian/installer/modules/i386/fuse-modules b/debian/installer/modules/i386/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/i386/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/i386/i2c-modules b/debian/installer/modules/i386/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/i386/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/i386/input-modules b/debian/installer/modules/i386/input-modules
new file mode 100644
index 000000000..cdba2e4a7
--- /dev/null
+++ b/debian/installer/modules/i386/input-modules
@@ -0,0 +1,5 @@
+#include <input-modules>
+# Needed on some Geode LX boards - Alix2/3/6, Soekris net5501, Traverse GEOS
+# so only built for 586 flavour
+gpio_keys_polled ?
+leds-gpio ?
diff --git a/debian/installer/modules/i386/isofs-modules b/debian/installer/modules/i386/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/i386/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/i386/jfs-modules b/debian/installer/modules/i386/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/i386/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/i386/kernel-image b/debian/installer/modules/i386/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/i386/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/i386/loop-modules b/debian/installer/modules/i386/loop-modules
new file mode 100644
index 000000000..164467713
--- /dev/null
+++ b/debian/installer/modules/i386/loop-modules
@@ -0,0 +1,2 @@
+#include <loop-modules>
+
diff --git a/debian/installer/modules/i386/md-modules b/debian/installer/modules/i386/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/modules/i386/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/modules/i386/mmc-core-modules b/debian/installer/modules/i386/mmc-core-modules
new file mode 100644
index 000000000..7bf38465c
--- /dev/null
+++ b/debian/installer/modules/i386/mmc-core-modules
@@ -0,0 +1 @@
+#include <mmc-core-modules>
diff --git a/debian/installer/modules/i386/mmc-modules b/debian/installer/modules/i386/mmc-modules
new file mode 100644
index 000000000..dadfd5334
--- /dev/null
+++ b/debian/installer/modules/i386/mmc-modules
@@ -0,0 +1 @@
+#include <mmc-modules>
diff --git a/debian/installer/modules/i386/mouse-modules b/debian/installer/modules/i386/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/i386/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/i386/mtd-core-modules b/debian/installer/modules/i386/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/i386/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/i386/multipath-modules b/debian/installer/modules/i386/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/i386/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/i386/nbd-modules b/debian/installer/modules/i386/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/i386/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/i386/nic-modules b/debian/installer/modules/i386/nic-modules
new file mode 100644
index 000000000..2512e8395
--- /dev/null
+++ b/debian/installer/modules/i386/nic-modules
@@ -0,0 +1 @@
+#include <nic-modules>
diff --git a/debian/installer/modules/i386/nic-pcmcia-modules b/debian/installer/modules/i386/nic-pcmcia-modules
new file mode 100644
index 000000000..7a0702cd5
--- /dev/null
+++ b/debian/installer/modules/i386/nic-pcmcia-modules
@@ -0,0 +1 @@
+#include <nic-pcmcia-modules>
diff --git a/debian/installer/modules/i386/nic-shared-modules b/debian/installer/modules/i386/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/i386/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/i386/nic-usb-modules b/debian/installer/modules/i386/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/i386/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/i386/nic-wireless-modules b/debian/installer/modules/i386/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/i386/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/i386/pata-modules b/debian/installer/modules/i386/pata-modules
new file mode 100644
index 000000000..8c4e514ae
--- /dev/null
+++ b/debian/installer/modules/i386/pata-modules
@@ -0,0 +1,2 @@
+#include <pata-modules>
+
diff --git a/debian/installer/modules/i386/pcmcia-modules b/debian/installer/modules/i386/pcmcia-modules
new file mode 100644
index 000000000..2bb5350fe
--- /dev/null
+++ b/debian/installer/modules/i386/pcmcia-modules
@@ -0,0 +1 @@
+#include <pcmcia-modules>
diff --git a/debian/installer/modules/i386/pcmcia-storage-modules b/debian/installer/modules/i386/pcmcia-storage-modules
new file mode 100644
index 000000000..f73ae5bb9
--- /dev/null
+++ b/debian/installer/modules/i386/pcmcia-storage-modules
@@ -0,0 +1 @@
+#include <pcmcia-storage-modules>
diff --git a/debian/installer/modules/i386/ppp-modules b/debian/installer/modules/i386/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/modules/i386/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/modules/i386/rfkill-modules b/debian/installer/modules/i386/rfkill-modules
new file mode 100644
index 000000000..77a2245ce
--- /dev/null
+++ b/debian/installer/modules/i386/rfkill-modules
@@ -0,0 +1 @@
+#include <rfkill-modules>
diff --git a/debian/installer/modules/i386/sata-modules b/debian/installer/modules/i386/sata-modules
new file mode 100644
index 000000000..071cb860b
--- /dev/null
+++ b/debian/installer/modules/i386/sata-modules
@@ -0,0 +1,2 @@
+#include <sata-modules>
+
diff --git a/debian/installer/modules/i386/scsi-core-modules b/debian/installer/modules/i386/scsi-core-modules
new file mode 100644
index 000000000..778a022fa
--- /dev/null
+++ b/debian/installer/modules/i386/scsi-core-modules
@@ -0,0 +1,4 @@
+#include <scsi-core-modules>
+
+# Needed by hv_storvsc in hyperv-modules as well as scsi-modules
+scsi_transport_fc
diff --git a/debian/installer/modules/i386/scsi-modules b/debian/installer/modules/i386/scsi-modules
new file mode 100644
index 000000000..8909dfb79
--- /dev/null
+++ b/debian/installer/modules/i386/scsi-modules
@@ -0,0 +1 @@
+#include <scsi-modules>
diff --git a/debian/installer/modules/i386/scsi-nic-modules b/debian/installer/modules/i386/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/i386/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/i386/serial-modules b/debian/installer/modules/i386/serial-modules
new file mode 100644
index 000000000..6ab8b8c35
--- /dev/null
+++ b/debian/installer/modules/i386/serial-modules
@@ -0,0 +1 @@
+#include <serial-modules>
diff --git a/debian/installer/modules/i386/sound-modules b/debian/installer/modules/i386/sound-modules
new file mode 100644
index 000000000..68395ab3d
--- /dev/null
+++ b/debian/installer/modules/i386/sound-modules
@@ -0,0 +1 @@
+#include <sound-modules>
diff --git a/debian/installer/modules/i386/speakup-modules b/debian/installer/modules/i386/speakup-modules
new file mode 100644
index 000000000..29592721a
--- /dev/null
+++ b/debian/installer/modules/i386/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>
diff --git a/debian/installer/modules/i386/squashfs-modules b/debian/installer/modules/i386/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/i386/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/i386/udf-modules b/debian/installer/modules/i386/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/i386/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/i386/uinput-modules b/debian/installer/modules/i386/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/modules/i386/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/modules/i386/usb-modules b/debian/installer/modules/i386/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/i386/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/i386/usb-serial-modules b/debian/installer/modules/i386/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/i386/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/i386/usb-storage-modules b/debian/installer/modules/i386/usb-storage-modules
new file mode 100644
index 000000000..272d95e2e
--- /dev/null
+++ b/debian/installer/modules/i386/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff --git a/debian/installer/modules/i386/xfs-modules b/debian/installer/modules/i386/xfs-modules
new file mode 100644
index 000000000..c020b5d39
--- /dev/null
+++ b/debian/installer/modules/i386/xfs-modules
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff --git a/debian/installer/modules/ia64/ata-modules b/debian/installer/modules/ia64/ata-modules
new file mode 100644
index 000000000..b81c0f38b
--- /dev/null
+++ b/debian/installer/modules/ia64/ata-modules
@@ -0,0 +1 @@
+#include <ata-modules>
diff --git a/debian/installer/modules/ia64/btrfs-modules b/debian/installer/modules/ia64/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/ia64/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/ia64/cdrom-core-modules b/debian/installer/modules/ia64/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/modules/ia64/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/modules/ia64/crc-modules b/debian/installer/modules/ia64/crc-modules
new file mode 100644
index 000000000..a642ead8b
--- /dev/null
+++ b/debian/installer/modules/ia64/crc-modules
@@ -0,0 +1,2 @@
+#include <crc-modules>
+
diff --git a/debian/installer/modules/ia64/crypto-dm-modules b/debian/installer/modules/ia64/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/ia64/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/ia64/crypto-modules b/debian/installer/modules/ia64/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/ia64/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/ia64/event-modules b/debian/installer/modules/ia64/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/ia64/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/ia64/ext4-modules b/debian/installer/modules/ia64/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/ia64/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/ia64/f2fs-modules b/debian/installer/modules/ia64/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/ia64/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/ia64/fat-modules b/debian/installer/modules/ia64/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/ia64/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/ia64/fb-modules b/debian/installer/modules/ia64/fb-modules
new file mode 100644
index 000000000..1442c89f9
--- /dev/null
+++ b/debian/installer/modules/ia64/fb-modules
@@ -0,0 +1,2 @@
+fbcon ?
+vgastate
diff --git a/debian/installer/modules/ia64/firewire-core-modules b/debian/installer/modules/ia64/firewire-core-modules
new file mode 100644
index 000000000..8e5fff165
--- /dev/null
+++ b/debian/installer/modules/ia64/firewire-core-modules
@@ -0,0 +1,2 @@
+#include <firewire-core-modules>
+
diff --git a/debian/installer/modules/ia64/fuse-modules b/debian/installer/modules/ia64/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/ia64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/ia64/i2c-modules b/debian/installer/modules/ia64/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/ia64/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/ia64/input-modules b/debian/installer/modules/ia64/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/ia64/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/ia64/isofs-modules b/debian/installer/modules/ia64/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/ia64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/ia64/jfs-modules b/debian/installer/modules/ia64/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/ia64/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/ia64/kernel-image b/debian/installer/modules/ia64/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/ia64/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/ia64/loop-modules b/debian/installer/modules/ia64/loop-modules
new file mode 100644
index 000000000..164467713
--- /dev/null
+++ b/debian/installer/modules/ia64/loop-modules
@@ -0,0 +1,2 @@
+#include <loop-modules>
+
diff --git a/debian/installer/modules/ia64/md-modules b/debian/installer/modules/ia64/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/modules/ia64/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/modules/ia64/mouse-modules b/debian/installer/modules/ia64/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/ia64/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/ia64/mtd-core-modules b/debian/installer/modules/ia64/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/ia64/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/ia64/multipath-modules b/debian/installer/modules/ia64/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/ia64/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/ia64/nbd-modules b/debian/installer/modules/ia64/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/ia64/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/ia64/nic-modules b/debian/installer/modules/ia64/nic-modules
new file mode 100644
index 000000000..2512e8395
--- /dev/null
+++ b/debian/installer/modules/ia64/nic-modules
@@ -0,0 +1 @@
+#include <nic-modules>
diff --git a/debian/installer/modules/ia64/nic-shared-modules b/debian/installer/modules/ia64/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/ia64/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/ia64/nic-usb-modules b/debian/installer/modules/ia64/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/ia64/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/ia64/pata-modules b/debian/installer/modules/ia64/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/ia64/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/ia64/pcmcia-modules b/debian/installer/modules/ia64/pcmcia-modules
new file mode 100644
index 000000000..d7a54f360
--- /dev/null
+++ b/debian/installer/modules/ia64/pcmcia-modules
@@ -0,0 +1,4 @@
+pcmcia
+pcmcia_core
+pd6729
+rsrc_nonstatic ?
diff --git a/debian/installer/modules/ia64/ppp-modules b/debian/installer/modules/ia64/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/modules/ia64/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/modules/ia64/sata-modules b/debian/installer/modules/ia64/sata-modules
new file mode 100644
index 000000000..071cb860b
--- /dev/null
+++ b/debian/installer/modules/ia64/sata-modules
@@ -0,0 +1,2 @@
+#include <sata-modules>
+
diff --git a/debian/installer/modules/ia64/scsi-core-modules b/debian/installer/modules/ia64/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/ia64/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/ia64/scsi-modules b/debian/installer/modules/ia64/scsi-modules
new file mode 100644
index 000000000..8909dfb79
--- /dev/null
+++ b/debian/installer/modules/ia64/scsi-modules
@@ -0,0 +1 @@
+#include <scsi-modules>
diff --git a/debian/installer/modules/ia64/scsi-nic-modules b/debian/installer/modules/ia64/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/ia64/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/ia64/serial-modules b/debian/installer/modules/ia64/serial-modules
new file mode 100644
index 000000000..6ab8b8c35
--- /dev/null
+++ b/debian/installer/modules/ia64/serial-modules
@@ -0,0 +1 @@
+#include <serial-modules>
diff --git a/debian/installer/modules/ia64/squashfs-modules b/debian/installer/modules/ia64/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/ia64/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/ia64/udf-modules b/debian/installer/modules/ia64/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/ia64/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/ia64/uinput-modules b/debian/installer/modules/ia64/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/modules/ia64/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/modules/ia64/usb-modules b/debian/installer/modules/ia64/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/ia64/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/ia64/usb-serial-modules b/debian/installer/modules/ia64/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/ia64/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/ia64/usb-storage-modules b/debian/installer/modules/ia64/usb-storage-modules
new file mode 100644
index 000000000..272d95e2e
--- /dev/null
+++ b/debian/installer/modules/ia64/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff --git a/debian/installer/modules/ia64/xfs-modules b/debian/installer/modules/ia64/xfs-modules
new file mode 100644
index 000000000..c020b5d39
--- /dev/null
+++ b/debian/installer/modules/ia64/xfs-modules
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff --git a/debian/installer/modules/input-modules b/debian/installer/modules/input-modules
new file mode 100644
index 000000000..754d740e9
--- /dev/null
+++ b/debian/installer/modules/input-modules
@@ -0,0 +1,44 @@
+# Include HID drivers by default
+drivers/hid/**
+
+# Include keyboards
+drivers/input/keyboard/** ?
+
+# Exclude drivers for anything but keyboard and mouse/trackball/touchpad
+drivers/hid/hid-*ff -
+hid-dr -
+hid-elecom -
+hid-gyration -
+hid-icade -
+hid-lcpower -
+hid-ntrig -
+hid-petalynx -
+hid-picolcd -
+hid-pl -
+hid-prodikeys -
+hid-ps3remote -
+hid-quanta -
+drivers/hid/hid-roccat-ko* -
+hid-roccat-pyra -
+hid-saitek -
+hid-sensor-hub -
+hid-sony -
+hid-tivo -
+hid-twinhan -
+hid-uclogic -
+hid-wacom -
+hid-waltop -
+hid-wiimote -
+hid-zydacron -
+wacom -
+
+# Miscellaneous input drivers
+atmel_mxt_ts ?
+synaptics_usb ?
+wistron_btns ?
+gpio_keys ?
+soc_button_array ?
+hyperv-keyboard ?
+virtio_console ?
+virtio_input ?
+olpc_apsp ?
diff --git a/debian/installer/modules/ipv6-modules b/debian/installer/modules/ipv6-modules
new file mode 100644
index 000000000..13ac34b44
--- /dev/null
+++ b/debian/installer/modules/ipv6-modules
@@ -0,0 +1 @@
+ipv6
diff --git a/debian/installer/modules/isofs-modules b/debian/installer/modules/isofs-modules
new file mode 100644
index 000000000..0f41779b7
--- /dev/null
+++ b/debian/installer/modules/isofs-modules
@@ -0,0 +1 @@
+isofs
diff --git a/debian/installer/modules/jffs2-modules b/debian/installer/modules/jffs2-modules
new file mode 100644
index 000000000..19f4e1094
--- /dev/null
+++ b/debian/installer/modules/jffs2-modules
@@ -0,0 +1 @@
+jffs2
diff --git a/debian/installer/modules/jfs-modules b/debian/installer/modules/jfs-modules
new file mode 100644
index 000000000..aa604c468
--- /dev/null
+++ b/debian/installer/modules/jfs-modules
@@ -0,0 +1 @@
+jfs
diff --git a/debian/installer/modules/kernel-image b/debian/installer/modules/kernel-image
new file mode 100644
index 000000000..54c950269
--- /dev/null
+++ b/debian/installer/modules/kernel-image
@@ -0,0 +1,40 @@
+af_packet
+bitrev ?
+eeprom_93cx6 ?
+firmware_class
+led-class ?
+# Both input-modules and sound-modules can depend on this
+ledtrig-audio ?
+mbcache
+mfd-core ?
+nls_base
+# Default I/O charset for most filesystems that do character conversion
+nls_utf8
+thermal_sys ?
+
+# In case they become modular again
+lz4_compress ?
+lz4hc_compress ?
+lz4_decompress ?
+lzo_compress
+lzo_decompress
+zlib_deflate
+zstd_compress
+zstd_decompress
+
+# Basic paravirtual modules
+hv_utils ?
+hv_vmbus ?
+virtio ?
+virtio_balloon ?
+virtio_mmio ?
+virtio_pci ?
+virtio_ring ?
+
+# The installer generally needs good entropy sources
+drivers/char/hw_random/**
+
+# LPSS might be needed for I2C (e.g. for touchpads on laptops), SPI, UART
+intel_lpss ?
+intel_lpss_acpi ?
+intel_lpss_pci ?
diff --git a/debian/installer/modules/leds-modules b/debian/installer/modules/leds-modules
new file mode 100644
index 000000000..fef2e5303
--- /dev/null
+++ b/debian/installer/modules/leds-modules
@@ -0,0 +1 @@
+leds-gpio
diff --git a/debian/installer/modules/loop-modules b/debian/installer/modules/loop-modules
new file mode 100644
index 000000000..1ef2ddf24
--- /dev/null
+++ b/debian/installer/modules/loop-modules
@@ -0,0 +1 @@
+loop
diff --git a/debian/installer/modules/m68k/affs-modules b/debian/installer/modules/m68k/affs-modules
new file mode 100644
index 000000000..21d616a1c
--- /dev/null
+++ b/debian/installer/modules/m68k/affs-modules
@@ -0,0 +1 @@
+#include <affs-modules>
diff --git a/debian/installer/modules/m68k/ata-modules b/debian/installer/modules/m68k/ata-modules
new file mode 100644
index 000000000..04d9c8841
--- /dev/null
+++ b/debian/installer/modules/m68k/ata-modules
@@ -0,0 +1 @@
+libata
diff --git a/debian/installer/modules/m68k/btrfs-modules b/debian/installer/modules/m68k/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/m68k/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/m68k/cdrom-core-modules b/debian/installer/modules/m68k/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/modules/m68k/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/modules/m68k/crc-modules b/debian/installer/modules/m68k/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/m68k/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/m68k/crypto-modules b/debian/installer/modules/m68k/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/m68k/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/m68k/ext4-modules b/debian/installer/modules/m68k/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/m68k/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/m68k/fat-modules b/debian/installer/modules/m68k/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/m68k/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/m68k/fuse-modules b/debian/installer/modules/m68k/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/m68k/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/m68k/hfs-modules b/debian/installer/modules/m68k/hfs-modules
new file mode 100644
index 000000000..57d12f649
--- /dev/null
+++ b/debian/installer/modules/m68k/hfs-modules
@@ -0,0 +1 @@
+#include <hfs-modules>
diff --git a/debian/installer/modules/m68k/isofs-modules b/debian/installer/modules/m68k/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/m68k/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/m68k/kernel-image b/debian/installer/modules/m68k/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/m68k/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/m68k/loop-modules b/debian/installer/modules/m68k/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/m68k/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/m68k/md-modules b/debian/installer/modules/m68k/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/m68k/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/m68k/nbd-modules b/debian/installer/modules/m68k/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/m68k/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/m68k/nic-modules b/debian/installer/modules/m68k/nic-modules
new file mode 100644
index 000000000..2512e8395
--- /dev/null
+++ b/debian/installer/modules/m68k/nic-modules
@@ -0,0 +1 @@
+#include <nic-modules>
diff --git a/debian/installer/modules/m68k/nic-shared-modules b/debian/installer/modules/m68k/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/m68k/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/m68k/pata-modules b/debian/installer/modules/m68k/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/m68k/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/m68k/ppp-modules b/debian/installer/modules/m68k/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/m68k/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/m68k/scsi-core-modules b/debian/installer/modules/m68k/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/m68k/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/m68k/scsi-modules b/debian/installer/modules/m68k/scsi-modules
new file mode 100644
index 000000000..f2956ef95
--- /dev/null
+++ b/debian/installer/modules/m68k/scsi-modules
@@ -0,0 +1,13 @@
+sg
+
+a2091
+a3000
+a4000t
+atari_scsi
+bvme6000_scsi
+gvp11
+mac_esp
+mac_scsi
+mvme16x_scsi
+zorro7xx
+zorro_esp
diff --git a/debian/installer/modules/m68k/squashfs-modules b/debian/installer/modules/m68k/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/m68k/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/m68k/udf-modules b/debian/installer/modules/m68k/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/m68k/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/md-modules b/debian/installer/modules/md-modules
new file mode 100644
index 000000000..d4f710406
--- /dev/null
+++ b/debian/installer/modules/md-modules
@@ -0,0 +1,16 @@
+linear
+md-mod
+dm-mod
+multipath
+raid0
+raid1
+raid456
+raid10
+dm-mirror
+dm-raid
+dm-snapshot
+bcache
+
+# RAID-related libraries, also used by btrfs
+raid6_pq
+xor
diff --git a/debian/installer/modules/minix-modules b/debian/installer/modules/minix-modules
new file mode 100644
index 000000000..aa6ca5db6
--- /dev/null
+++ b/debian/installer/modules/minix-modules
@@ -0,0 +1 @@
+minix
diff --git a/debian/installer/modules/mips/affs-modules b/debian/installer/modules/mips/affs-modules
new file mode 100644
index 000000000..21d616a1c
--- /dev/null
+++ b/debian/installer/modules/mips/affs-modules
@@ -0,0 +1 @@
+#include <affs-modules>
diff --git a/debian/installer/modules/mips/ata-modules b/debian/installer/modules/mips/ata-modules
new file mode 100644
index 000000000..b81c0f38b
--- /dev/null
+++ b/debian/installer/modules/mips/ata-modules
@@ -0,0 +1 @@
+#include <ata-modules>
diff --git a/debian/installer/modules/mips/btrfs-modules b/debian/installer/modules/mips/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/mips/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/mips/cdrom-core-modules b/debian/installer/modules/mips/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/modules/mips/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/modules/mips/crc-modules b/debian/installer/modules/mips/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/mips/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/mips/crypto-dm-modules b/debian/installer/modules/mips/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/mips/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/mips/crypto-modules b/debian/installer/modules/mips/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/mips/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/mips/event-modules b/debian/installer/modules/mips/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/mips/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/mips/ext4-modules b/debian/installer/modules/mips/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/mips/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/mips/f2fs-modules b/debian/installer/modules/mips/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/mips/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/mips/fat-modules b/debian/installer/modules/mips/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/mips/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/mips/fb-modules b/debian/installer/modules/mips/fb-modules
new file mode 100644
index 000000000..7653cb832
--- /dev/null
+++ b/debian/installer/modules/mips/fb-modules
@@ -0,0 +1,6 @@
+#include <fb-modules>
+
+amdgpu -
+radeon -
+ast -
+sm750fb -
diff --git a/debian/installer/modules/mips/firewire-core-modules b/debian/installer/modules/mips/firewire-core-modules
new file mode 100644
index 000000000..dcac80af9
--- /dev/null
+++ b/debian/installer/modules/mips/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff --git a/debian/installer/modules/mips/fuse-modules b/debian/installer/modules/mips/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/mips/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/mips/input-modules b/debian/installer/modules/mips/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/mips/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/mips/isofs-modules b/debian/installer/modules/mips/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/mips/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/mips/jfs-modules b/debian/installer/modules/mips/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/mips/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/mips/kernel-image b/debian/installer/modules/mips/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/mips/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/mips/loop-modules b/debian/installer/modules/mips/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/mips/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/mips/md-modules b/debian/installer/modules/mips/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/mips/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/mips/minix-modules b/debian/installer/modules/mips/minix-modules
new file mode 100644
index 000000000..82b984372
--- /dev/null
+++ b/debian/installer/modules/mips/minix-modules
@@ -0,0 +1 @@
+#include <minix-modules>
diff --git a/debian/installer/modules/mips/mmc-core-modules b/debian/installer/modules/mips/mmc-core-modules
new file mode 100644
index 000000000..7bf38465c
--- /dev/null
+++ b/debian/installer/modules/mips/mmc-core-modules
@@ -0,0 +1 @@
+#include <mmc-core-modules>
diff --git a/debian/installer/modules/mips/mmc-modules b/debian/installer/modules/mips/mmc-modules
new file mode 100644
index 000000000..dadfd5334
--- /dev/null
+++ b/debian/installer/modules/mips/mmc-modules
@@ -0,0 +1 @@
+#include <mmc-modules>
diff --git a/debian/installer/modules/mips/mouse-modules b/debian/installer/modules/mips/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/mips/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/mips/multipath-modules b/debian/installer/modules/mips/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/mips/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/mips/nbd-modules b/debian/installer/modules/mips/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/mips/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/mips/nfs-modules b/debian/installer/modules/mips/nfs-modules
new file mode 100644
index 000000000..946fb8e44
--- /dev/null
+++ b/debian/installer/modules/mips/nfs-modules
@@ -0,0 +1 @@
+#include <nfs-modules>
diff --git a/debian/installer/modules/mips/nic-modules b/debian/installer/modules/mips/nic-modules
new file mode 100644
index 000000000..3a2814f9e
--- /dev/null
+++ b/debian/installer/modules/mips/nic-modules
@@ -0,0 +1,15 @@
+#include <nic-modules>
+8139cp -
+8139too -
+dmfe -
+e100 -
+epic100 -
+fealnx -
+natsemi -
+ne2k-pci -
+skfp -
+sundance -
+starfire -
+tulip -
+typhoon -
+winbond-840 -
diff --git a/debian/installer/modules/mips/nic-shared-modules b/debian/installer/modules/mips/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/mips/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/mips/nic-usb-modules b/debian/installer/modules/mips/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/mips/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/mips/nic-wireless-modules b/debian/installer/modules/mips/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/mips/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/mips/pata-modules b/debian/installer/modules/mips/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/mips/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/mips/ppp-modules b/debian/installer/modules/mips/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/mips/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/mips/qnx4-modules b/debian/installer/modules/mips/qnx4-modules
new file mode 100644
index 000000000..cd0c96d41
--- /dev/null
+++ b/debian/installer/modules/mips/qnx4-modules
@@ -0,0 +1 @@
+#include <qnx4-modules>
diff --git a/debian/installer/modules/mips/sata-modules b/debian/installer/modules/mips/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/modules/mips/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/modules/mips/scsi-core-modules b/debian/installer/modules/mips/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/mips/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/mips/scsi-modules b/debian/installer/modules/mips/scsi-modules
new file mode 100644
index 000000000..bf002062d
--- /dev/null
+++ b/debian/installer/modules/mips/scsi-modules
@@ -0,0 +1,4 @@
+#include <scsi-modules>
+dmx3191d -
+ips -
+sym53c8xx -
diff --git a/debian/installer/modules/mips/scsi-nic-modules b/debian/installer/modules/mips/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/mips/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/mips/sound-modules b/debian/installer/modules/mips/sound-modules
new file mode 100644
index 000000000..68395ab3d
--- /dev/null
+++ b/debian/installer/modules/mips/sound-modules
@@ -0,0 +1 @@
+#include <sound-modules>
diff --git a/debian/installer/modules/mips/speakup-modules b/debian/installer/modules/mips/speakup-modules
new file mode 100644
index 000000000..29592721a
--- /dev/null
+++ b/debian/installer/modules/mips/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>
diff --git a/debian/installer/modules/mips/squashfs-modules b/debian/installer/modules/mips/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/mips/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/mips/udf-modules b/debian/installer/modules/mips/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/mips/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/mips/usb-modules b/debian/installer/modules/mips/usb-modules
new file mode 100644
index 000000000..9bac97ff0
--- /dev/null
+++ b/debian/installer/modules/mips/usb-modules
@@ -0,0 +1,2 @@
+#include <usb-modules>
+octeon-hcd -
diff --git a/debian/installer/modules/mips/usb-serial-modules b/debian/installer/modules/mips/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/mips/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/mips/usb-storage-modules b/debian/installer/modules/mips/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/modules/mips/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/modules/mips/xfs-modules b/debian/installer/modules/mips/xfs-modules
new file mode 100644
index 000000000..98374e2bb
--- /dev/null
+++ b/debian/installer/modules/mips/xfs-modules
@@ -0,0 +1 @@
+#include <xfs-modules>
diff --git a/debian/installer/modules/mips64 b/debian/installer/modules/mips64
new file mode 120000
index 000000000..af28acbd9
--- /dev/null
+++ b/debian/installer/modules/mips64
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mips64el b/debian/installer/modules/mips64el
new file mode 120000
index 000000000..af28acbd9
--- /dev/null
+++ b/debian/installer/modules/mips64el
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mips64r6 b/debian/installer/modules/mips64r6
new file mode 120000
index 000000000..af28acbd9
--- /dev/null
+++ b/debian/installer/modules/mips64r6
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mips64r6el b/debian/installer/modules/mips64r6el
new file mode 120000
index 000000000..af28acbd9
--- /dev/null
+++ b/debian/installer/modules/mips64r6el
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mipsel b/debian/installer/modules/mipsel
new file mode 120000
index 000000000..af28acbd9
--- /dev/null
+++ b/debian/installer/modules/mipsel
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mipsr6 b/debian/installer/modules/mipsr6
new file mode 120000
index 000000000..af28acbd9
--- /dev/null
+++ b/debian/installer/modules/mipsr6
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mipsr6el b/debian/installer/modules/mipsr6el
new file mode 120000
index 000000000..af28acbd9
--- /dev/null
+++ b/debian/installer/modules/mipsr6el
@@ -0,0 +1 @@
+mips
\ No newline at end of file
diff --git a/debian/installer/modules/mmc-core-modules b/debian/installer/modules/mmc-core-modules
new file mode 100644
index 000000000..67128eac0
--- /dev/null
+++ b/debian/installer/modules/mmc-core-modules
@@ -0,0 +1 @@
+mmc_core
diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules
new file mode 100644
index 000000000..c7aa372bd
--- /dev/null
+++ b/debian/installer/modules/mmc-modules
@@ -0,0 +1,8 @@
+mmc_block
+drivers/mmc/host/**
+
+# Multifunction card reader driver
+tifm_7xx1 ?
+
+# Adds a dependency on pcmcia-modules
+sdricoh_cs -
diff --git a/debian/installer/modules/mouse-modules b/debian/installer/modules/mouse-modules
new file mode 100644
index 000000000..8d65ba4d8
--- /dev/null
+++ b/debian/installer/modules/mouse-modules
@@ -0,0 +1 @@
+psmouse
diff --git a/debian/installer/modules/mtd-core-modules b/debian/installer/modules/mtd-core-modules
new file mode 100644
index 000000000..96dc6e77f
--- /dev/null
+++ b/debian/installer/modules/mtd-core-modules
@@ -0,0 +1 @@
+mtd
diff --git a/debian/installer/modules/mtd-modules b/debian/installer/modules/mtd-modules
new file mode 100644
index 000000000..90e6b13f6
--- /dev/null
+++ b/debian/installer/modules/mtd-modules
@@ -0,0 +1 @@
+mtdblock
diff --git a/debian/installer/modules/multipath-modules b/debian/installer/modules/multipath-modules
new file mode 100644
index 000000000..2e235994c
--- /dev/null
+++ b/debian/installer/modules/multipath-modules
@@ -0,0 +1,4 @@
+dm-multipath
+dm-round-robin
+dm-service-time
+drivers/scsi/device_handler/*
diff --git a/debian/installer/modules/nbd-modules b/debian/installer/modules/nbd-modules
new file mode 100644
index 000000000..cb3ca605f
--- /dev/null
+++ b/debian/installer/modules/nbd-modules
@@ -0,0 +1 @@
+nbd
diff --git a/debian/installer/modules/nfs-modules b/debian/installer/modules/nfs-modules
new file mode 100644
index 000000000..a5bfd2ce6
--- /dev/null
+++ b/debian/installer/modules/nfs-modules
@@ -0,0 +1,3 @@
+nfs
+lockd
+sunrpc
diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules
new file mode 100644
index 000000000..45ddeaae5
--- /dev/null
+++ b/debian/installer/modules/nic-modules
@@ -0,0 +1,29 @@
+# Include Ethernet switch, controller and PHY drivers by default
+drivers/net/dsa/** ?
+drivers/net/ethernet/**
+
+# Include paravirtual network drivers
+hv_netvsc ?
+virtio_net ?
+vmxnet3 ?
+xen-netfront ?
+
+# Include VLAN driver
+8021q
+
+# Include bonding driver
+bonding
+
+# Exclude drivers packaged in nic-pcmcia-modules
+drivers/net/**_cs -
+b44 -
+xircom_cb -
+
+# Exclude libraries packaged in nic-{common,shared} modules
+8390 -
+fixed_phy -
+libphy -
+mdio_devres -
+
+# Exclude iSCSI drivers packaged in scsi-modules
+cnic -
diff --git a/debian/installer/modules/nic-pcmcia-modules b/debian/installer/modules/nic-pcmcia-modules
new file mode 100644
index 000000000..31c360d5a
--- /dev/null
+++ b/debian/installer/modules/nic-pcmcia-modules
@@ -0,0 +1,10 @@
+# Include PCMCIA Ethernet and wireless drivers by default
+drivers/net/ethernet/**_cs
+drivers/net/wireless/**_cs
+b44 ?
+hostap_plx ?
+xircom_cb
+
+# Exclude drivers packaged in nic-wireless-modules
+libertas_cs -
+spectrum_cs -
diff --git a/debian/installer/modules/nic-shared-modules b/debian/installer/modules/nic-shared-modules
new file mode 100644
index 000000000..f47cbe4ab
--- /dev/null
+++ b/debian/installer/modules/nic-shared-modules
@@ -0,0 +1,11 @@
+drivers/net/phy/**
+
+8390 ?
+fixed_phy ?
+libphy ?
+mdio_devres ?
+mii ?
+of_mdio ?
+pps_core ?
+ptp ?
+selftests ?
diff --git a/debian/installer/modules/nic-usb-modules b/debian/installer/modules/nic-usb-modules
new file mode 100644
index 000000000..332e01518
--- /dev/null
+++ b/debian/installer/modules/nic-usb-modules
@@ -0,0 +1,15 @@
+# Include USB wired drivers by default
+drivers/net/usb/*
+
+# Include rndis_wlan, which depends on rndis_host
+rndis_wlan
+
+# Exclude wireless modem drivers which need extra configuration
+cdc_mbim -
+cdc-phonet -
+hso -
+huawei_cdc_ncm -
+kalmia -
+lg-vl600 -
+qmi_wwan -
+sierra_net -
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
new file mode 100644
index 000000000..6c9415b96
--- /dev/null
+++ b/debian/installer/modules/nic-wireless-modules
@@ -0,0 +1,31 @@
+# Include wireless drivers by default
+drivers/net/wireless/**
+
+# Include staging wireless drivers
+prism2_usb ?
+drivers/staging/rtl8** ?
+r8188eu ?
+vt6656_stage ?
+
+# Exclude drivers packaged in nic-pcmcia-modules
+drivers/net/wireless/**_cs -
+airo -
+hostap_plx -
+
+# Don't separate these from their driver families
+libertas_cs ?
+spectrum_cs ?
+
+# Exclude drivers packaged in nic-usb-modules
+rndis_wlan -
+
+# Exclude debug driver
+mac80211_hwsim -
+
+# lib80211 encryption algorithms
+lib80211_crypt_wep ?
+lib80211_crypt_ccmp ?
+lib80211_crypt_tkip ?
+
+# (pending) ath11k_pci soft-dep:
+qrtr_mhi ?
diff --git a/debian/installer/modules/pata-modules b/debian/installer/modules/pata-modules
new file mode 100644
index 000000000..1d963a18e
--- /dev/null
+++ b/debian/installer/modules/pata-modules
@@ -0,0 +1,9 @@
+# Include PATA drivers by default
+drivers/ata/pata_*
+
+# Exclude pata_sis, which goes in sata-modules as a dependency of sata_sis
+pata_sis -
+
+# Exclude drivers packaged in pcmcia-storage-modules
+pata_ninja32 -
+pata_pcmcia -
diff --git a/debian/installer/modules/pcmcia-modules b/debian/installer/modules/pcmcia-modules
new file mode 100644
index 000000000..ab5b4b234
--- /dev/null
+++ b/debian/installer/modules/pcmcia-modules
@@ -0,0 +1,8 @@
+pcmcia
+
+i82092
+i82365 ?
+pcmcia_core
+tcic ?
+yenta_socket
+pd6729 ?
diff --git a/debian/installer/modules/pcmcia-storage-modules b/debian/installer/modules/pcmcia-storage-modules
new file mode 100644
index 000000000..b6b172164
--- /dev/null
+++ b/debian/installer/modules/pcmcia-storage-modules
@@ -0,0 +1,2 @@
+pata_ninja32 ?
+pata_pcmcia ?
diff --git a/debian/installer/modules/powerpc-powerpc64/affs-modules b/debian/installer/modules/powerpc-powerpc64/affs-modules
new file mode 100644
index 000000000..f12f6ace2
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/affs-modules
@@ -0,0 +1 @@
+#include "../powerpc/affs-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/ata-modules b/debian/installer/modules/powerpc-powerpc64/ata-modules
new file mode 100644
index 000000000..39540d4b6
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/ata-modules
@@ -0,0 +1 @@
+#include "../powerpc/ata-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/btrfs-modules b/debian/installer/modules/powerpc-powerpc64/btrfs-modules
new file mode 100644
index 000000000..9eeeb149a
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/btrfs-modules
@@ -0,0 +1 @@
+#include "../powerpc/btrfs-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/cdrom-core-modules b/debian/installer/modules/powerpc-powerpc64/cdrom-core-modules
new file mode 100644
index 000000000..feed89a1a
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/cdrom-core-modules
@@ -0,0 +1 @@
+#include "../powerpc/cdrom-core-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/crc-modules b/debian/installer/modules/powerpc-powerpc64/crc-modules
new file mode 100644
index 000000000..b49dc9eca
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/crc-modules
@@ -0,0 +1 @@
+#include "../powerpc/crc-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/crypto-dm-modules b/debian/installer/modules/powerpc-powerpc64/crypto-dm-modules
new file mode 100644
index 000000000..6613c798f
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/crypto-dm-modules
@@ -0,0 +1 @@
+#include "../powerpc/crypto-dm-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/crypto-modules b/debian/installer/modules/powerpc-powerpc64/crypto-modules
new file mode 100644
index 000000000..8fa818fb8
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/crypto-modules
@@ -0,0 +1 @@
+#include "../powerpc/crypto-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/event-modules b/debian/installer/modules/powerpc-powerpc64/event-modules
new file mode 100644
index 000000000..9e9424c60
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/event-modules
@@ -0,0 +1 @@
+#include "../powerpc/event-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/ext4-modules b/debian/installer/modules/powerpc-powerpc64/ext4-modules
new file mode 100644
index 000000000..664c3118f
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/ext4-modules
@@ -0,0 +1 @@
+#include "../powerpc/ext4-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/f2fs-modules b/debian/installer/modules/powerpc-powerpc64/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/powerpc-powerpc64/fancontrol-modules b/debian/installer/modules/powerpc-powerpc64/fancontrol-modules
new file mode 100644
index 000000000..a3fc55cca
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/fancontrol-modules
@@ -0,0 +1,19 @@
+i2c-powermac ?
+windfarm_core ?
+windfarm_cpufreq_clamp ?
+windfarm_lm75_sensor ?
+windfarm_max6690_sensor ?
+windfarm_pid ?
+windfarm_pm121 ?
+windfarm_pm112 ?
+windfarm_pm81 ?
+windfarm_pm91 ?
+windfarm_pm72 ?
+windfarm_rm31 ?
+windfarm_smu_controls ?
+windfarm_smu_sat ?
+windfarm_smu_sensors ?
+windfarm_ad7417_sensor ?
+windfarm_fcu_controls ?
+windfarm_lm87_sensor ?
+windfarm_pid ?
diff --git a/debian/installer/modules/powerpc-powerpc64/fat-modules b/debian/installer/modules/powerpc-powerpc64/fat-modules
new file mode 100644
index 000000000..043dc5602
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/fat-modules
@@ -0,0 +1 @@
+#include "../powerpc/fat-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/fb-modules b/debian/installer/modules/powerpc-powerpc64/fb-modules
new file mode 100644
index 000000000..8857d558d
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/fb-modules
@@ -0,0 +1,4 @@
+# We *don't* want the extra modules listed in powerpc/fb-modules
+#include <fb-modules>
+
+ast
diff --git a/debian/installer/modules/powerpc-powerpc64/firewire-core-modules b/debian/installer/modules/powerpc-powerpc64/firewire-core-modules
new file mode 100644
index 000000000..035ab3162
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/firewire-core-modules
@@ -0,0 +1 @@
+#include "../powerpc/firewire-core-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/fuse-modules b/debian/installer/modules/powerpc-powerpc64/fuse-modules
new file mode 100644
index 000000000..49bdce41b
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/fuse-modules
@@ -0,0 +1 @@
+#include "../powerpc/fuse-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/hfs-modules b/debian/installer/modules/powerpc-powerpc64/hfs-modules
new file mode 100644
index 000000000..a85f69143
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/hfs-modules
@@ -0,0 +1 @@
+#include "../powerpc/hfs-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/hypervisor-modules b/debian/installer/modules/powerpc-powerpc64/hypervisor-modules
new file mode 100644
index 000000000..29ceb6154
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/hypervisor-modules
@@ -0,0 +1,2 @@
+hvcserver
+hvcs
diff --git a/debian/installer/modules/powerpc-powerpc64/i2c-modules b/debian/installer/modules/powerpc-powerpc64/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/powerpc-powerpc64/input-modules b/debian/installer/modules/powerpc-powerpc64/input-modules
new file mode 100644
index 000000000..38a888940
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/input-modules
@@ -0,0 +1 @@
+#include "../powerpc/input-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/isofs-modules b/debian/installer/modules/powerpc-powerpc64/isofs-modules
new file mode 100644
index 000000000..5a0326172
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/isofs-modules
@@ -0,0 +1 @@
+#include "../powerpc/isofs-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/jfs-modules b/debian/installer/modules/powerpc-powerpc64/jfs-modules
new file mode 100644
index 000000000..b71ebd35e
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/jfs-modules
@@ -0,0 +1 @@
+#include "../powerpc/jfs-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/kernel-image b/debian/installer/modules/powerpc-powerpc64/kernel-image
new file mode 100644
index 000000000..a0b7d0cf4
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/kernel-image
@@ -0,0 +1 @@
+#include "../powerpc/kernel-image"
diff --git a/debian/installer/modules/powerpc-powerpc64/loop-modules b/debian/installer/modules/powerpc-powerpc64/loop-modules
new file mode 100644
index 000000000..e2273687f
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/loop-modules
@@ -0,0 +1 @@
+#include "../powerpc/loop-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/md-modules b/debian/installer/modules/powerpc-powerpc64/md-modules
new file mode 100644
index 000000000..93be33f95
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/md-modules
@@ -0,0 +1 @@
+#include "../powerpc/md-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/mmc-core-modules b/debian/installer/modules/powerpc-powerpc64/mmc-core-modules
new file mode 100644
index 000000000..5308bc434
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/mmc-core-modules
@@ -0,0 +1 @@
+#include "../powerpc/mmc-core-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/mouse-modules b/debian/installer/modules/powerpc-powerpc64/mouse-modules
new file mode 100644
index 000000000..22aca9411
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/mouse-modules
@@ -0,0 +1 @@
+#include "../powerpc/mouse-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/mtd-core-modules b/debian/installer/modules/powerpc-powerpc64/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/powerpc-powerpc64/multipath-modules b/debian/installer/modules/powerpc-powerpc64/multipath-modules
new file mode 100644
index 000000000..fcb0045b0
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/multipath-modules
@@ -0,0 +1 @@
+#include "../powerpc/multipath-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/nbd-modules b/debian/installer/modules/powerpc-powerpc64/nbd-modules
new file mode 100644
index 000000000..ff7fc80ea
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/nbd-modules
@@ -0,0 +1 @@
+#include "../powerpc/nbd-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/nic-modules b/debian/installer/modules/powerpc-powerpc64/nic-modules
new file mode 100644
index 000000000..7578f4332
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/nic-modules
@@ -0,0 +1 @@
+#include "../powerpc/nic-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/nic-pcmcia-modules b/debian/installer/modules/powerpc-powerpc64/nic-pcmcia-modules
new file mode 100644
index 000000000..3f521e9db
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/nic-pcmcia-modules
@@ -0,0 +1 @@
+#include "../powerpc/nic-pcmcia-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/nic-shared-modules b/debian/installer/modules/powerpc-powerpc64/nic-shared-modules
new file mode 100644
index 000000000..5b05e0d43
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/nic-shared-modules
@@ -0,0 +1 @@
+#include "../powerpc/nic-shared-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/nic-usb-modules b/debian/installer/modules/powerpc-powerpc64/nic-usb-modules
new file mode 100644
index 000000000..790780afc
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/nic-usb-modules
@@ -0,0 +1 @@
+#include "../powerpc/nic-usb-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/nic-wireless-modules b/debian/installer/modules/powerpc-powerpc64/nic-wireless-modules
new file mode 100644
index 000000000..b25c130da
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/nic-wireless-modules
@@ -0,0 +1 @@
+#include "../powerpc/nic-wireless-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/pata-modules b/debian/installer/modules/powerpc-powerpc64/pata-modules
new file mode 100644
index 000000000..bb9cbe3ab
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/pata-modules
@@ -0,0 +1 @@
+#include "../powerpc/pata-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/pcmcia-modules b/debian/installer/modules/powerpc-powerpc64/pcmcia-modules
new file mode 100644
index 000000000..e508df664
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/pcmcia-modules
@@ -0,0 +1 @@
+#include "../powerpc/pcmcia-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/pcmcia-storage-modules b/debian/installer/modules/powerpc-powerpc64/pcmcia-storage-modules
new file mode 100644
index 000000000..f00f24605
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/pcmcia-storage-modules
@@ -0,0 +1 @@
+#include "../powerpc/pcmcia-storage-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/ppp-modules b/debian/installer/modules/powerpc-powerpc64/ppp-modules
new file mode 100644
index 000000000..eb7ab74a5
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/ppp-modules
@@ -0,0 +1 @@
+#include "../powerpc/ppp-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/sata-modules b/debian/installer/modules/powerpc-powerpc64/sata-modules
new file mode 100644
index 000000000..591ad7410
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/sata-modules
@@ -0,0 +1 @@
+#include "../powerpc/sata-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/scsi-core-modules b/debian/installer/modules/powerpc-powerpc64/scsi-core-modules
new file mode 100644
index 000000000..c972a4717
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/scsi-core-modules
@@ -0,0 +1 @@
+#include "../powerpc/scsi-core-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/scsi-modules b/debian/installer/modules/powerpc-powerpc64/scsi-modules
new file mode 100644
index 000000000..74a817729
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/scsi-modules
@@ -0,0 +1,7 @@
+#include "../powerpc/scsi-modules"
+
+# Really SATA, but keep it with ps3rom as they both depend on ps3stor_lib
+ps3disk ?
+
+# Exclude target driver
+ibmvscsis -
diff --git a/debian/installer/modules/powerpc-powerpc64/scsi-nic-modules b/debian/installer/modules/powerpc-powerpc64/scsi-nic-modules
new file mode 100644
index 000000000..edcfa738e
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/scsi-nic-modules
@@ -0,0 +1 @@
+#include "../powerpc/scsi-nic-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/serial-modules b/debian/installer/modules/powerpc-powerpc64/serial-modules
new file mode 100644
index 000000000..349196e30
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/serial-modules
@@ -0,0 +1 @@
+#include "../powerpc/serial-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/squashfs-modules b/debian/installer/modules/powerpc-powerpc64/squashfs-modules
new file mode 100644
index 000000000..32a1b6ffa
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/squashfs-modules
@@ -0,0 +1 @@
+#include "../powerpc/squashfs-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/udf-modules b/debian/installer/modules/powerpc-powerpc64/udf-modules
new file mode 100644
index 000000000..6c72cbc14
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/udf-modules
@@ -0,0 +1 @@
+#include "../powerpc/udf-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/uinput-modules b/debian/installer/modules/powerpc-powerpc64/uinput-modules
new file mode 100644
index 000000000..5020f7cc3
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/uinput-modules
@@ -0,0 +1 @@
+#include "../powerpc/uinput-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/usb-modules b/debian/installer/modules/powerpc-powerpc64/usb-modules
new file mode 100644
index 000000000..9c5b10a7b
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/usb-modules
@@ -0,0 +1 @@
+#include "../powerpc/usb-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/usb-serial-modules b/debian/installer/modules/powerpc-powerpc64/usb-serial-modules
new file mode 100644
index 000000000..e25b55862
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/usb-serial-modules
@@ -0,0 +1 @@
+#include "../powerpc/usb-serial-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/usb-storage-modules b/debian/installer/modules/powerpc-powerpc64/usb-storage-modules
new file mode 100644
index 000000000..5f278e65f
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/usb-storage-modules
@@ -0,0 +1 @@
+#include "../powerpc/usb-storage-modules"
diff --git a/debian/installer/modules/powerpc-powerpc64/xfs-modules b/debian/installer/modules/powerpc-powerpc64/xfs-modules
new file mode 100644
index 000000000..c850127e9
--- /dev/null
+++ b/debian/installer/modules/powerpc-powerpc64/xfs-modules
@@ -0,0 +1 @@
+#include "../powerpc/xfs-modules"
diff --git a/debian/installer/modules/powerpc/affs-modules b/debian/installer/modules/powerpc/affs-modules
new file mode 100644
index 000000000..3f0e4bb90
--- /dev/null
+++ b/debian/installer/modules/powerpc/affs-modules
@@ -0,0 +1,2 @@
+#include <affs-modules>
+
diff --git a/debian/installer/modules/powerpc/ata-modules b/debian/installer/modules/powerpc/ata-modules
new file mode 100644
index 000000000..b81c0f38b
--- /dev/null
+++ b/debian/installer/modules/powerpc/ata-modules
@@ -0,0 +1 @@
+#include <ata-modules>
diff --git a/debian/installer/modules/powerpc/btrfs-modules b/debian/installer/modules/powerpc/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/powerpc/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/powerpc/cdrom-core-modules b/debian/installer/modules/powerpc/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/powerpc/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/powerpc/crc-modules b/debian/installer/modules/powerpc/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/powerpc/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/powerpc/crypto-dm-modules b/debian/installer/modules/powerpc/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/powerpc/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/powerpc/crypto-modules b/debian/installer/modules/powerpc/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/powerpc/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/powerpc/event-modules b/debian/installer/modules/powerpc/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/powerpc/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/powerpc/ext4-modules b/debian/installer/modules/powerpc/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/powerpc/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/powerpc/f2fs-modules b/debian/installer/modules/powerpc/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/powerpc/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/powerpc/fat-modules b/debian/installer/modules/powerpc/fat-modules
new file mode 100644
index 000000000..cce8fd30c
--- /dev/null
+++ b/debian/installer/modules/powerpc/fat-modules
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff --git a/debian/installer/modules/powerpc/fb-modules b/debian/installer/modules/powerpc/fb-modules
new file mode 100644
index 000000000..3a53ab269
--- /dev/null
+++ b/debian/installer/modules/powerpc/fb-modules
@@ -0,0 +1,7 @@
+#include <fb-modules>
+
+# 32-bit PowerMacs mostly have either ATI Rage 128 or Radeon graphics
+# chips for which the offb driver doesn't work properly.  aty128fb is
+# currently built-in but that could plausibly change in future.
+aty128fb
+radeonfb
diff --git a/debian/installer/modules/powerpc/firewire-core-modules b/debian/installer/modules/powerpc/firewire-core-modules
new file mode 100644
index 000000000..dcac80af9
--- /dev/null
+++ b/debian/installer/modules/powerpc/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff --git a/debian/installer/modules/powerpc/fuse-modules b/debian/installer/modules/powerpc/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/powerpc/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/powerpc/hfs-modules b/debian/installer/modules/powerpc/hfs-modules
new file mode 100644
index 000000000..57d12f649
--- /dev/null
+++ b/debian/installer/modules/powerpc/hfs-modules
@@ -0,0 +1 @@
+#include <hfs-modules>
diff --git a/debian/installer/modules/powerpc/input-modules b/debian/installer/modules/powerpc/input-modules
new file mode 100644
index 000000000..51e37ced9
--- /dev/null
+++ b/debian/installer/modules/powerpc/input-modules
@@ -0,0 +1,3 @@
+#include <input-modules>
+atkbd
+i8042
diff --git a/debian/installer/modules/powerpc/isofs-modules b/debian/installer/modules/powerpc/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/powerpc/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/powerpc/jfs-modules b/debian/installer/modules/powerpc/jfs-modules
new file mode 100644
index 000000000..925a43a9e
--- /dev/null
+++ b/debian/installer/modules/powerpc/jfs-modules
@@ -0,0 +1,2 @@
+#include <jfs-modules>
+
diff --git a/debian/installer/modules/powerpc/kernel-image b/debian/installer/modules/powerpc/kernel-image
new file mode 100644
index 000000000..b17bb591a
--- /dev/null
+++ b/debian/installer/modules/powerpc/kernel-image
@@ -0,0 +1,2 @@
+#include <kernel-image>
+bestcomm-core ?
diff --git a/debian/installer/modules/powerpc/loop-modules b/debian/installer/modules/powerpc/loop-modules
new file mode 100644
index 000000000..164467713
--- /dev/null
+++ b/debian/installer/modules/powerpc/loop-modules
@@ -0,0 +1,2 @@
+#include <loop-modules>
+
diff --git a/debian/installer/modules/powerpc/md-modules b/debian/installer/modules/powerpc/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/modules/powerpc/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/modules/powerpc/mmc-core-modules b/debian/installer/modules/powerpc/mmc-core-modules
new file mode 100644
index 000000000..7bf38465c
--- /dev/null
+++ b/debian/installer/modules/powerpc/mmc-core-modules
@@ -0,0 +1 @@
+#include <mmc-core-modules>
diff --git a/debian/installer/modules/powerpc/mouse-modules b/debian/installer/modules/powerpc/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/modules/powerpc/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/modules/powerpc/multipath-modules b/debian/installer/modules/powerpc/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/powerpc/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/powerpc/nbd-modules b/debian/installer/modules/powerpc/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/powerpc/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/powerpc/nic-modules b/debian/installer/modules/powerpc/nic-modules
new file mode 100644
index 000000000..cdf8960d9
--- /dev/null
+++ b/debian/installer/modules/powerpc/nic-modules
@@ -0,0 +1,4 @@
+#include <nic-modules>
+
+# Include AppleTalk-IP driver
+ipddp
diff --git a/debian/installer/modules/powerpc/nic-pcmcia-modules b/debian/installer/modules/powerpc/nic-pcmcia-modules
new file mode 100644
index 000000000..7a0702cd5
--- /dev/null
+++ b/debian/installer/modules/powerpc/nic-pcmcia-modules
@@ -0,0 +1 @@
+#include <nic-pcmcia-modules>
diff --git a/debian/installer/modules/powerpc/nic-shared-modules b/debian/installer/modules/powerpc/nic-shared-modules
new file mode 100644
index 000000000..a6f274a44
--- /dev/null
+++ b/debian/installer/modules/powerpc/nic-shared-modules
@@ -0,0 +1,2 @@
+#include <nic-shared-modules>
+llc
diff --git a/debian/installer/modules/powerpc/nic-usb-modules b/debian/installer/modules/powerpc/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/powerpc/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/powerpc/nic-wireless-modules b/debian/installer/modules/powerpc/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/powerpc/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/powerpc/pata-modules b/debian/installer/modules/powerpc/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/powerpc/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/powerpc/pcmcia-modules b/debian/installer/modules/powerpc/pcmcia-modules
new file mode 100644
index 000000000..2bb5350fe
--- /dev/null
+++ b/debian/installer/modules/powerpc/pcmcia-modules
@@ -0,0 +1 @@
+#include <pcmcia-modules>
diff --git a/debian/installer/modules/powerpc/pcmcia-storage-modules b/debian/installer/modules/powerpc/pcmcia-storage-modules
new file mode 100644
index 000000000..9fbaff306
--- /dev/null
+++ b/debian/installer/modules/powerpc/pcmcia-storage-modules
@@ -0,0 +1,2 @@
+#include <pcmcia-storage-modules>
+
diff --git a/debian/installer/modules/powerpc/ppp-modules b/debian/installer/modules/powerpc/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/modules/powerpc/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/modules/powerpc/sata-modules b/debian/installer/modules/powerpc/sata-modules
new file mode 100644
index 000000000..071cb860b
--- /dev/null
+++ b/debian/installer/modules/powerpc/sata-modules
@@ -0,0 +1,2 @@
+#include <sata-modules>
+
diff --git a/debian/installer/modules/powerpc/scsi-core-modules b/debian/installer/modules/powerpc/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/powerpc/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/powerpc/scsi-modules b/debian/installer/modules/powerpc/scsi-modules
new file mode 100644
index 000000000..8909dfb79
--- /dev/null
+++ b/debian/installer/modules/powerpc/scsi-modules
@@ -0,0 +1 @@
+#include <scsi-modules>
diff --git a/debian/installer/modules/powerpc/scsi-nic-modules b/debian/installer/modules/powerpc/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/powerpc/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/powerpc/serial-modules b/debian/installer/modules/powerpc/serial-modules
new file mode 100644
index 000000000..6ab8b8c35
--- /dev/null
+++ b/debian/installer/modules/powerpc/serial-modules
@@ -0,0 +1 @@
+#include <serial-modules>
diff --git a/debian/installer/modules/powerpc/squashfs-modules b/debian/installer/modules/powerpc/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/powerpc/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/powerpc/udf-modules b/debian/installer/modules/powerpc/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/powerpc/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/powerpc/uinput-modules b/debian/installer/modules/powerpc/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/modules/powerpc/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/modules/powerpc/usb-modules b/debian/installer/modules/powerpc/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/powerpc/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/powerpc/usb-serial-modules b/debian/installer/modules/powerpc/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/powerpc/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/powerpc/usb-storage-modules b/debian/installer/modules/powerpc/usb-storage-modules
new file mode 100644
index 000000000..272d95e2e
--- /dev/null
+++ b/debian/installer/modules/powerpc/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff --git a/debian/installer/modules/powerpc/xfs-modules b/debian/installer/modules/powerpc/xfs-modules
new file mode 100644
index 000000000..c020b5d39
--- /dev/null
+++ b/debian/installer/modules/powerpc/xfs-modules
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff --git a/debian/installer/modules/ppc64 b/debian/installer/modules/ppc64
new file mode 120000
index 000000000..a3e2a5788
--- /dev/null
+++ b/debian/installer/modules/ppc64
@@ -0,0 +1 @@
+powerpc-powerpc64
\ No newline at end of file
diff --git a/debian/installer/modules/ppc64el/ata-modules b/debian/installer/modules/ppc64el/ata-modules
new file mode 100644
index 000000000..03599667e
--- /dev/null
+++ b/debian/installer/modules/ppc64el/ata-modules
@@ -0,0 +1 @@
+#include "../ppc64/ata-modules"
diff --git a/debian/installer/modules/ppc64el/btrfs-modules b/debian/installer/modules/ppc64el/btrfs-modules
new file mode 100644
index 000000000..1d9d7d86f
--- /dev/null
+++ b/debian/installer/modules/ppc64el/btrfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/btrfs-modules"
diff --git a/debian/installer/modules/ppc64el/cdrom-core-modules b/debian/installer/modules/ppc64el/cdrom-core-modules
new file mode 100644
index 000000000..4e22480aa
--- /dev/null
+++ b/debian/installer/modules/ppc64el/cdrom-core-modules
@@ -0,0 +1 @@
+#include "../ppc64/cdrom-core-modules"
diff --git a/debian/installer/modules/ppc64el/crc-modules b/debian/installer/modules/ppc64el/crc-modules
new file mode 100644
index 000000000..6adf710ee
--- /dev/null
+++ b/debian/installer/modules/ppc64el/crc-modules
@@ -0,0 +1 @@
+#include "../ppc64/crc-modules"
diff --git a/debian/installer/modules/ppc64el/crypto-dm-modules b/debian/installer/modules/ppc64el/crypto-dm-modules
new file mode 100644
index 000000000..f00e29325
--- /dev/null
+++ b/debian/installer/modules/ppc64el/crypto-dm-modules
@@ -0,0 +1 @@
+#include "../ppc64/crypto-dm-modules"
diff --git a/debian/installer/modules/ppc64el/crypto-modules b/debian/installer/modules/ppc64el/crypto-modules
new file mode 100644
index 000000000..1d84b7f90
--- /dev/null
+++ b/debian/installer/modules/ppc64el/crypto-modules
@@ -0,0 +1 @@
+#include "../ppc64/crypto-modules"
diff --git a/debian/installer/modules/ppc64el/event-modules b/debian/installer/modules/ppc64el/event-modules
new file mode 100644
index 000000000..e4a33897e
--- /dev/null
+++ b/debian/installer/modules/ppc64el/event-modules
@@ -0,0 +1 @@
+#include "../ppc64/event-modules"
diff --git a/debian/installer/modules/ppc64el/ext4-modules b/debian/installer/modules/ppc64el/ext4-modules
new file mode 100644
index 000000000..b145b0d96
--- /dev/null
+++ b/debian/installer/modules/ppc64el/ext4-modules
@@ -0,0 +1 @@
+#include "../ppc64/ext4-modules"
diff --git a/debian/installer/modules/ppc64el/f2fs-modules b/debian/installer/modules/ppc64el/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/ppc64el/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/ppc64el/fancontrol-modules b/debian/installer/modules/ppc64el/fancontrol-modules
new file mode 100644
index 000000000..c3ace7562
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fancontrol-modules
@@ -0,0 +1 @@
+#include "../ppc64/fancontrol-modules"
diff --git a/debian/installer/modules/ppc64el/fat-modules b/debian/installer/modules/ppc64el/fat-modules
new file mode 100644
index 000000000..016d97275
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fat-modules
@@ -0,0 +1 @@
+#include "../ppc64/fat-modules"
diff --git a/debian/installer/modules/ppc64el/fb-modules b/debian/installer/modules/ppc64el/fb-modules
new file mode 100644
index 000000000..9b0ad3c94
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fb-modules
@@ -0,0 +1,3 @@
+#include <fb-modules>
+
+ast
diff --git a/debian/installer/modules/ppc64el/firewire-core-modules b/debian/installer/modules/ppc64el/firewire-core-modules
new file mode 100644
index 000000000..5a7791fe8
--- /dev/null
+++ b/debian/installer/modules/ppc64el/firewire-core-modules
@@ -0,0 +1 @@
+#include "../ppc64/firewire-core-modules"
diff --git a/debian/installer/modules/ppc64el/fuse-modules b/debian/installer/modules/ppc64el/fuse-modules
new file mode 100644
index 000000000..c90a988b2
--- /dev/null
+++ b/debian/installer/modules/ppc64el/fuse-modules
@@ -0,0 +1 @@
+#include "../ppc64/fuse-modules"
diff --git a/debian/installer/modules/ppc64el/hypervisor-modules b/debian/installer/modules/ppc64el/hypervisor-modules
new file mode 100644
index 000000000..2c8e7d824
--- /dev/null
+++ b/debian/installer/modules/ppc64el/hypervisor-modules
@@ -0,0 +1 @@
+#include "../ppc64/hypervisor-modules"
diff --git a/debian/installer/modules/ppc64el/i2c-modules b/debian/installer/modules/ppc64el/i2c-modules
new file mode 100644
index 000000000..1121952ac
--- /dev/null
+++ b/debian/installer/modules/ppc64el/i2c-modules
@@ -0,0 +1 @@
+#include "../ppc64/i2c-modules"
diff --git a/debian/installer/modules/ppc64el/input-modules b/debian/installer/modules/ppc64el/input-modules
new file mode 100644
index 000000000..94d6a1174
--- /dev/null
+++ b/debian/installer/modules/ppc64el/input-modules
@@ -0,0 +1 @@
+#include "../ppc64/input-modules"
diff --git a/debian/installer/modules/ppc64el/isofs-modules b/debian/installer/modules/ppc64el/isofs-modules
new file mode 100644
index 000000000..ff9a9e5cb
--- /dev/null
+++ b/debian/installer/modules/ppc64el/isofs-modules
@@ -0,0 +1 @@
+#include "../ppc64/isofs-modules"
diff --git a/debian/installer/modules/ppc64el/jfs-modules b/debian/installer/modules/ppc64el/jfs-modules
new file mode 100644
index 000000000..86a502bda
--- /dev/null
+++ b/debian/installer/modules/ppc64el/jfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/jfs-modules"
diff --git a/debian/installer/modules/ppc64el/kernel-image b/debian/installer/modules/ppc64el/kernel-image
new file mode 100644
index 000000000..243665337
--- /dev/null
+++ b/debian/installer/modules/ppc64el/kernel-image
@@ -0,0 +1 @@
+#include "../ppc64/kernel-image"
diff --git a/debian/installer/modules/ppc64el/loop-modules b/debian/installer/modules/ppc64el/loop-modules
new file mode 100644
index 000000000..2373df643
--- /dev/null
+++ b/debian/installer/modules/ppc64el/loop-modules
@@ -0,0 +1 @@
+#include "../ppc64/loop-modules"
diff --git a/debian/installer/modules/ppc64el/md-modules b/debian/installer/modules/ppc64el/md-modules
new file mode 100644
index 000000000..be97ac8b0
--- /dev/null
+++ b/debian/installer/modules/ppc64el/md-modules
@@ -0,0 +1 @@
+#include "../ppc64/md-modules"
diff --git a/debian/installer/modules/ppc64el/mouse-modules b/debian/installer/modules/ppc64el/mouse-modules
new file mode 100644
index 000000000..fecdd47a4
--- /dev/null
+++ b/debian/installer/modules/ppc64el/mouse-modules
@@ -0,0 +1 @@
+#include "../ppc64/mouse-modules"
diff --git a/debian/installer/modules/ppc64el/mtd-core-modules b/debian/installer/modules/ppc64el/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/ppc64el/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/ppc64el/multipath-modules b/debian/installer/modules/ppc64el/multipath-modules
new file mode 100644
index 000000000..d6965bdb8
--- /dev/null
+++ b/debian/installer/modules/ppc64el/multipath-modules
@@ -0,0 +1 @@
+#include "../ppc64/multipath-modules"
diff --git a/debian/installer/modules/ppc64el/nbd-modules b/debian/installer/modules/ppc64el/nbd-modules
new file mode 100644
index 000000000..9037d8f63
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nbd-modules
@@ -0,0 +1 @@
+#include "../ppc64/nbd-modules"
diff --git a/debian/installer/modules/ppc64el/nic-modules b/debian/installer/modules/ppc64el/nic-modules
new file mode 100644
index 000000000..f69226417
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nic-modules
@@ -0,0 +1 @@
+#include "../ppc64/nic-modules"
diff --git a/debian/installer/modules/ppc64el/nic-shared-modules b/debian/installer/modules/ppc64el/nic-shared-modules
new file mode 100644
index 000000000..c8ff13b12
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nic-shared-modules
@@ -0,0 +1 @@
+#include "../ppc64/nic-shared-modules"
diff --git a/debian/installer/modules/ppc64el/nic-usb-modules b/debian/installer/modules/ppc64el/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/ppc64el/nic-wireless-modules b/debian/installer/modules/ppc64el/nic-wireless-modules
new file mode 100644
index 000000000..68609a32c
--- /dev/null
+++ b/debian/installer/modules/ppc64el/nic-wireless-modules
@@ -0,0 +1 @@
+#include "../ppc64/nic-wireless-modules"
diff --git a/debian/installer/modules/ppc64el/ppp-modules b/debian/installer/modules/ppc64el/ppp-modules
new file mode 100644
index 000000000..212615220
--- /dev/null
+++ b/debian/installer/modules/ppc64el/ppp-modules
@@ -0,0 +1 @@
+#include "../ppc64/ppp-modules"
diff --git a/debian/installer/modules/ppc64el/sata-modules b/debian/installer/modules/ppc64el/sata-modules
new file mode 100644
index 000000000..92f711ac9
--- /dev/null
+++ b/debian/installer/modules/ppc64el/sata-modules
@@ -0,0 +1 @@
+#include "../ppc64/sata-modules"
diff --git a/debian/installer/modules/ppc64el/scsi-core-modules b/debian/installer/modules/ppc64el/scsi-core-modules
new file mode 100644
index 000000000..b764c2b2e
--- /dev/null
+++ b/debian/installer/modules/ppc64el/scsi-core-modules
@@ -0,0 +1 @@
+#include "../ppc64/scsi-core-modules"
diff --git a/debian/installer/modules/ppc64el/scsi-modules b/debian/installer/modules/ppc64el/scsi-modules
new file mode 100644
index 000000000..c3979d673
--- /dev/null
+++ b/debian/installer/modules/ppc64el/scsi-modules
@@ -0,0 +1 @@
+#include "../ppc64/scsi-modules"
diff --git a/debian/installer/modules/ppc64el/scsi-nic-modules b/debian/installer/modules/ppc64el/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/ppc64el/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/ppc64el/serial-modules b/debian/installer/modules/ppc64el/serial-modules
new file mode 100644
index 000000000..111ebcd6d
--- /dev/null
+++ b/debian/installer/modules/ppc64el/serial-modules
@@ -0,0 +1 @@
+#include "../ppc64/serial-modules"
diff --git a/debian/installer/modules/ppc64el/squashfs-modules b/debian/installer/modules/ppc64el/squashfs-modules
new file mode 100644
index 000000000..557d0d204
--- /dev/null
+++ b/debian/installer/modules/ppc64el/squashfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/squashfs-modules"
diff --git a/debian/installer/modules/ppc64el/udf-modules b/debian/installer/modules/ppc64el/udf-modules
new file mode 100644
index 000000000..c7471ab0b
--- /dev/null
+++ b/debian/installer/modules/ppc64el/udf-modules
@@ -0,0 +1 @@
+#include "../ppc64/udf-modules"
diff --git a/debian/installer/modules/ppc64el/uinput-modules b/debian/installer/modules/ppc64el/uinput-modules
new file mode 100644
index 000000000..4a3898f13
--- /dev/null
+++ b/debian/installer/modules/ppc64el/uinput-modules
@@ -0,0 +1 @@
+#include "../ppc64/uinput-modules"
diff --git a/debian/installer/modules/ppc64el/usb-modules b/debian/installer/modules/ppc64el/usb-modules
new file mode 100644
index 000000000..a113185a2
--- /dev/null
+++ b/debian/installer/modules/ppc64el/usb-modules
@@ -0,0 +1 @@
+#include "../ppc64/usb-modules"
diff --git a/debian/installer/modules/ppc64el/usb-serial-modules b/debian/installer/modules/ppc64el/usb-serial-modules
new file mode 100644
index 000000000..c7fe81a40
--- /dev/null
+++ b/debian/installer/modules/ppc64el/usb-serial-modules
@@ -0,0 +1 @@
+#include "../ppc64/usb-serial-modules"
diff --git a/debian/installer/modules/ppc64el/usb-storage-modules b/debian/installer/modules/ppc64el/usb-storage-modules
new file mode 100644
index 000000000..43d2811a9
--- /dev/null
+++ b/debian/installer/modules/ppc64el/usb-storage-modules
@@ -0,0 +1 @@
+#include "../ppc64/usb-storage-modules"
diff --git a/debian/installer/modules/ppc64el/xfs-modules b/debian/installer/modules/ppc64el/xfs-modules
new file mode 100644
index 000000000..3431331e9
--- /dev/null
+++ b/debian/installer/modules/ppc64el/xfs-modules
@@ -0,0 +1 @@
+#include "../ppc64/xfs-modules"
diff --git a/debian/installer/modules/ppp-modules b/debian/installer/modules/ppp-modules
new file mode 100644
index 000000000..0dd77f0b5
--- /dev/null
+++ b/debian/installer/modules/ppp-modules
@@ -0,0 +1,5 @@
+ppp_async ?
+ppp_deflate
+ppp_synctty ?
+pppoe
+pppox
diff --git a/debian/installer/modules/qnx4-modules b/debian/installer/modules/qnx4-modules
new file mode 100644
index 000000000..05d4adc62
--- /dev/null
+++ b/debian/installer/modules/qnx4-modules
@@ -0,0 +1 @@
+qnx4
diff --git a/debian/installer/modules/rfkill-modules b/debian/installer/modules/rfkill-modules
new file mode 100644
index 000000000..c9eff47f9
--- /dev/null
+++ b/debian/installer/modules/rfkill-modules
@@ -0,0 +1 @@
+rfkill
diff --git a/debian/installer/modules/riscv64/ata-modules b/debian/installer/modules/riscv64/ata-modules
new file mode 100644
index 000000000..ab5e7fdf0
--- /dev/null
+++ b/debian/installer/modules/riscv64/ata-modules
@@ -0,0 +1 @@
+libata ?
diff --git a/debian/installer/modules/riscv64/btrfs-modules b/debian/installer/modules/riscv64/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/riscv64/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/riscv64/cdrom-core-modules b/debian/installer/modules/riscv64/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/modules/riscv64/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/modules/riscv64/crc-modules b/debian/installer/modules/riscv64/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/riscv64/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/riscv64/crypto-dm-modules b/debian/installer/modules/riscv64/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/riscv64/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/riscv64/crypto-modules b/debian/installer/modules/riscv64/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/riscv64/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/riscv64/event-modules b/debian/installer/modules/riscv64/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/modules/riscv64/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/modules/riscv64/ext4-modules b/debian/installer/modules/riscv64/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/riscv64/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/riscv64/f2fs-modules b/debian/installer/modules/riscv64/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/riscv64/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/riscv64/fat-modules b/debian/installer/modules/riscv64/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/riscv64/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/riscv64/fb-modules b/debian/installer/modules/riscv64/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/riscv64/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>
diff --git a/debian/installer/modules/riscv64/fuse-modules b/debian/installer/modules/riscv64/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/riscv64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/riscv64/i2c-modules b/debian/installer/modules/riscv64/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/riscv64/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/riscv64/input-modules b/debian/installer/modules/riscv64/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/riscv64/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/riscv64/isofs-modules b/debian/installer/modules/riscv64/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/riscv64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/riscv64/jfs-modules b/debian/installer/modules/riscv64/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/riscv64/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/riscv64/kernel-image b/debian/installer/modules/riscv64/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/riscv64/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/riscv64/loop-modules b/debian/installer/modules/riscv64/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/riscv64/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/riscv64/md-modules b/debian/installer/modules/riscv64/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/riscv64/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/riscv64/mmc-core-modules b/debian/installer/modules/riscv64/mmc-core-modules
new file mode 100644
index 000000000..7bf38465c
--- /dev/null
+++ b/debian/installer/modules/riscv64/mmc-core-modules
@@ -0,0 +1 @@
+#include <mmc-core-modules>
diff --git a/debian/installer/modules/riscv64/mmc-modules b/debian/installer/modules/riscv64/mmc-modules
new file mode 100644
index 000000000..dadfd5334
--- /dev/null
+++ b/debian/installer/modules/riscv64/mmc-modules
@@ -0,0 +1 @@
+#include <mmc-modules>
diff --git a/debian/installer/modules/riscv64/mtd-core-modules b/debian/installer/modules/riscv64/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/riscv64/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/riscv64/mtd-modules b/debian/installer/modules/riscv64/mtd-modules
new file mode 100644
index 000000000..5dd7997b2
--- /dev/null
+++ b/debian/installer/modules/riscv64/mtd-modules
@@ -0,0 +1 @@
+#include <mtd-modules>
diff --git a/debian/installer/modules/riscv64/multipath-modules b/debian/installer/modules/riscv64/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/riscv64/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/riscv64/nbd-modules b/debian/installer/modules/riscv64/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/riscv64/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/riscv64/nic-modules b/debian/installer/modules/riscv64/nic-modules
new file mode 100644
index 000000000..2512e8395
--- /dev/null
+++ b/debian/installer/modules/riscv64/nic-modules
@@ -0,0 +1 @@
+#include <nic-modules>
diff --git a/debian/installer/modules/riscv64/nic-shared-modules b/debian/installer/modules/riscv64/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/riscv64/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/riscv64/nic-usb-modules b/debian/installer/modules/riscv64/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/riscv64/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/riscv64/nic-wireless-modules b/debian/installer/modules/riscv64/nic-wireless-modules
new file mode 100644
index 000000000..53fd18d7f
--- /dev/null
+++ b/debian/installer/modules/riscv64/nic-wireless-modules
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff --git a/debian/installer/modules/riscv64/pata-modules b/debian/installer/modules/riscv64/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/riscv64/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/riscv64/ppp-modules b/debian/installer/modules/riscv64/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/riscv64/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/riscv64/sata-modules b/debian/installer/modules/riscv64/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/modules/riscv64/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/modules/riscv64/scsi-core-modules b/debian/installer/modules/riscv64/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/modules/riscv64/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/modules/riscv64/scsi-modules b/debian/installer/modules/riscv64/scsi-modules
new file mode 100644
index 000000000..675462a14
--- /dev/null
+++ b/debian/installer/modules/riscv64/scsi-modules
@@ -0,0 +1,2 @@
+#include <scsi-modules>
+
diff --git a/debian/installer/modules/riscv64/scsi-nic-modules b/debian/installer/modules/riscv64/scsi-nic-modules
new file mode 100644
index 000000000..089dd5dc6
--- /dev/null
+++ b/debian/installer/modules/riscv64/scsi-nic-modules
@@ -0,0 +1 @@
+#include <scsi-nic-modules>
diff --git a/debian/installer/modules/riscv64/squashfs-modules b/debian/installer/modules/riscv64/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/riscv64/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/riscv64/udf-modules b/debian/installer/modules/riscv64/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/riscv64/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/riscv64/usb-modules b/debian/installer/modules/riscv64/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/riscv64/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/riscv64/usb-serial-modules b/debian/installer/modules/riscv64/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/riscv64/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/riscv64/usb-storage-modules b/debian/installer/modules/riscv64/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/modules/riscv64/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/modules/s390x/btrfs-modules b/debian/installer/modules/s390x/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/s390x/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/s390x/cdrom-core-modules b/debian/installer/modules/s390x/cdrom-core-modules
new file mode 100644
index 000000000..3ff69b48f
--- /dev/null
+++ b/debian/installer/modules/s390x/cdrom-core-modules
@@ -0,0 +1 @@
+#include <cdrom-core-modules>
diff --git a/debian/installer/modules/s390x/crc-modules b/debian/installer/modules/s390x/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/s390x/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/s390x/crypto-dm-modules b/debian/installer/modules/s390x/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/s390x/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/s390x/crypto-modules b/debian/installer/modules/s390x/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/s390x/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/s390x/dasd-extra-modules b/debian/installer/modules/s390x/dasd-extra-modules
new file mode 100644
index 000000000..ddd10cdfb
--- /dev/null
+++ b/debian/installer/modules/s390x/dasd-extra-modules
@@ -0,0 +1 @@
+dasd_diag_mod
diff --git a/debian/installer/modules/s390x/dasd-modules b/debian/installer/modules/s390x/dasd-modules
new file mode 100644
index 000000000..d3df219e7
--- /dev/null
+++ b/debian/installer/modules/s390x/dasd-modules
@@ -0,0 +1,2 @@
+dasd_eckd_mod
+dasd_fba_mod
diff --git a/debian/installer/modules/s390x/ext4-modules b/debian/installer/modules/s390x/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/s390x/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/s390x/f2fs-modules b/debian/installer/modules/s390x/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/s390x/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/s390x/fat-modules b/debian/installer/modules/s390x/fat-modules
new file mode 100644
index 000000000..cce8fd30c
--- /dev/null
+++ b/debian/installer/modules/s390x/fat-modules
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff --git a/debian/installer/modules/s390x/fuse-modules b/debian/installer/modules/s390x/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/s390x/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/s390x/isofs-modules b/debian/installer/modules/s390x/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/s390x/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/s390x/kernel-image b/debian/installer/modules/s390x/kernel-image
new file mode 100644
index 000000000..fd8c3a772
--- /dev/null
+++ b/debian/installer/modules/s390x/kernel-image
@@ -0,0 +1,2 @@
+#include <kernel-image>
+vmcp ?
diff --git a/debian/installer/modules/s390x/loop-modules b/debian/installer/modules/s390x/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/s390x/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/s390x/md-modules b/debian/installer/modules/s390x/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/modules/s390x/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/modules/s390x/mtd-core-modules b/debian/installer/modules/s390x/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/s390x/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/s390x/multipath-modules b/debian/installer/modules/s390x/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/s390x/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/s390x/nbd-modules b/debian/installer/modules/s390x/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/s390x/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/s390x/nic-modules b/debian/installer/modules/s390x/nic-modules
new file mode 100644
index 000000000..5e39d1f5e
--- /dev/null
+++ b/debian/installer/modules/s390x/nic-modules
@@ -0,0 +1,7 @@
+netiucv
+ctcm
+lcs
+qeth
+qeth_l2
+qeth_l3
+virtio_net
diff --git a/debian/installer/modules/s390x/scsi-core-modules b/debian/installer/modules/s390x/scsi-core-modules
new file mode 100644
index 000000000..3537f8234
--- /dev/null
+++ b/debian/installer/modules/s390x/scsi-core-modules
@@ -0,0 +1,2 @@
+#include <scsi-core-modules>
+
diff --git a/debian/installer/modules/s390x/scsi-modules b/debian/installer/modules/s390x/scsi-modules
new file mode 100644
index 000000000..0a64e24fe
--- /dev/null
+++ b/debian/installer/modules/s390x/scsi-modules
@@ -0,0 +1,2 @@
+#include <scsi-modules>
+zfcp
diff --git a/debian/installer/modules/s390x/udf-modules b/debian/installer/modules/s390x/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/s390x/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/s390x/xfs-modules b/debian/installer/modules/s390x/xfs-modules
new file mode 100644
index 000000000..c020b5d39
--- /dev/null
+++ b/debian/installer/modules/s390x/xfs-modules
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff --git a/debian/installer/modules/sata-modules b/debian/installer/modules/sata-modules
new file mode 100644
index 000000000..da038b739
--- /dev/null
+++ b/debian/installer/modules/sata-modules
@@ -0,0 +1,13 @@
+# Include SATA drivers by default
+drivers/ata/ahci* ?
+drivers/ata/sata_*
+
+# sata-sis depends on pata-sis; avoid a dependency
+pata_sis ?
+
+# Include more SATA drivers with unusual names
+acard-ahci ?
+ata_piix ?
+sx8 ?
+pdc_adma ?
+mtip32xx ?
diff --git a/debian/installer/modules/scsi-core-modules b/debian/installer/modules/scsi-core-modules
new file mode 100644
index 000000000..6b95c3a8f
--- /dev/null
+++ b/debian/installer/modules/scsi-core-modules
@@ -0,0 +1,5 @@
+scsi_common
+scsi_mod
+sd_mod
+scsi_transport_sas ?
+scsi_transport_spi ?
diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules
new file mode 100644
index 000000000..dfc866448
--- /dev/null
+++ b/debian/installer/modules/scsi-modules
@@ -0,0 +1,48 @@
+# Include SCSI controller drivers by default
+drivers/scsi/**
+mptfc
+mptsas
+mptspi
+
+# Include iSCSI boot support
+iscsi_ibft ?
+
+# Include Xen block driver even though it's not SCSI
+xen-blkfront ?
+
+# Exclude PCMCIA drivers, which depend on pcmcia-modules (FIXME)
+drivers/scsi/pcmcia/* -
+
+# Exclude drivers for converged NICs, packaged in scsi-nic-modules
+drivers/scsi/cxgbi/* -
+cxgb3i -
+cxgb4i -
+qedf -
+qedi -
+
+# Exclude enclosure driver
+ses -
+
+# Exclude target drivers
+tcm_qla2xxx -
+
+# Exclude common code packaged in {cdrom,scsi}-core-modules
+scsi_common -
+scsi_mod -
+sd_mod -
+sr_mod -
+scsi_transport_sas -
+scsi_transport_spi -
+
+# Exclude any other common code that isn't pulled in by dependencies
+drivers/scsi/device_handler/* -
+drivers/scsi/lib** -
+drivers/scsi/osd/* -
+drivers/scsi/scsi_transport_* -
+fcoe -
+raid_class -
+scsi_debug -
+
+# XXX not actually SCSI
+nvme ?
+virtio_blk ?
diff --git a/debian/installer/modules/scsi-nic-modules b/debian/installer/modules/scsi-nic-modules
new file mode 100644
index 000000000..b2b8f5e5d
--- /dev/null
+++ b/debian/installer/modules/scsi-nic-modules
@@ -0,0 +1,4 @@
+cxgb3i
+cxgb4i
+qedf
+qedi
diff --git a/debian/installer/modules/serial-modules b/debian/installer/modules/serial-modules
new file mode 100644
index 000000000..738348dd6
--- /dev/null
+++ b/debian/installer/modules/serial-modules
@@ -0,0 +1,3 @@
+rp2 ?
+serial_cs ?
+synclink_cs ?
diff --git a/debian/installer/modules/sh4-sh7751r/btrfs-modules b/debian/installer/modules/sh4-sh7751r/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/cdrom-core-modules b/debian/installer/modules/sh4-sh7751r/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/sh4-sh7751r/crc-modules b/debian/installer/modules/sh4-sh7751r/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/crypto-dm-modules b/debian/installer/modules/sh4-sh7751r/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/crypto-modules b/debian/installer/modules/sh4-sh7751r/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/ext4-modules b/debian/installer/modules/sh4-sh7751r/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/f2fs-modules b/debian/installer/modules/sh4-sh7751r/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/fat-modules b/debian/installer/modules/sh4-sh7751r/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/firewire-core-modules b/debian/installer/modules/sh4-sh7751r/firewire-core-modules
new file mode 100644
index 000000000..dcac80af9
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/fuse-modules b/debian/installer/modules/sh4-sh7751r/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/i2c-modules b/debian/installer/modules/sh4-sh7751r/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/isofs-modules b/debian/installer/modules/sh4-sh7751r/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/jfs-modules b/debian/installer/modules/sh4-sh7751r/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/kernel-image b/debian/installer/modules/sh4-sh7751r/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/sh4-sh7751r/loop-modules b/debian/installer/modules/sh4-sh7751r/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/md-modules b/debian/installer/modules/sh4-sh7751r/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/minix-modules b/debian/installer/modules/sh4-sh7751r/minix-modules
new file mode 100644
index 000000000..82b984372
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/minix-modules
@@ -0,0 +1 @@
+#include <minix-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/multipath-modules b/debian/installer/modules/sh4-sh7751r/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/nbd-modules b/debian/installer/modules/sh4-sh7751r/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/nic-modules b/debian/installer/modules/sh4-sh7751r/nic-modules
new file mode 100644
index 000000000..67761a69c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/nic-modules
@@ -0,0 +1,6 @@
+3c59x ?
+8139too ?
+e100 ?
+e1000 ?
+ne2k-pci ?
+r8169 ?
diff --git a/debian/installer/modules/sh4-sh7751r/nic-shared-modules b/debian/installer/modules/sh4-sh7751r/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/nic-usb-modules b/debian/installer/modules/sh4-sh7751r/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/pata-modules b/debian/installer/modules/sh4-sh7751r/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/ppp-modules b/debian/installer/modules/sh4-sh7751r/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/sata-modules b/debian/installer/modules/sh4-sh7751r/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/sound-modules b/debian/installer/modules/sh4-sh7751r/sound-modules
new file mode 100644
index 000000000..68395ab3d
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/sound-modules
@@ -0,0 +1 @@
+#include <sound-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/speakup-modules b/debian/installer/modules/sh4-sh7751r/speakup-modules
new file mode 100644
index 000000000..29592721a
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/squashfs-modules b/debian/installer/modules/sh4-sh7751r/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/udf-modules b/debian/installer/modules/sh4-sh7751r/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/usb-serial-modules b/debian/installer/modules/sh4-sh7751r/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/usb-storage-modules b/debian/installer/modules/sh4-sh7751r/usb-storage-modules
new file mode 100644
index 000000000..8c5e81b55
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/usb-storage-modules
@@ -0,0 +1 @@
+#include <usb-storage-modules>
diff --git a/debian/installer/modules/sh4-sh7751r/xfs-modules b/debian/installer/modules/sh4-sh7751r/xfs-modules
new file mode 100644
index 000000000..98374e2bb
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7751r/xfs-modules
@@ -0,0 +1 @@
+#include <xfs-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/btrfs-modules b/debian/installer/modules/sh4-sh7785lcr/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/cdrom-core-modules b/debian/installer/modules/sh4-sh7785lcr/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/sh4-sh7785lcr/crc-modules b/debian/installer/modules/sh4-sh7785lcr/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/crypto-dm-modules b/debian/installer/modules/sh4-sh7785lcr/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/crypto-modules b/debian/installer/modules/sh4-sh7785lcr/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/ext4-modules b/debian/installer/modules/sh4-sh7785lcr/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/f2fs-modules b/debian/installer/modules/sh4-sh7785lcr/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/fat-modules b/debian/installer/modules/sh4-sh7785lcr/fat-modules
new file mode 100644
index 000000000..274584eb6
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/fat-modules
@@ -0,0 +1 @@
+#include <fat-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/firewire-core-modules b/debian/installer/modules/sh4-sh7785lcr/firewire-core-modules
new file mode 100644
index 000000000..dcac80af9
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/fuse-modules b/debian/installer/modules/sh4-sh7785lcr/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/isofs-modules b/debian/installer/modules/sh4-sh7785lcr/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/jfs-modules b/debian/installer/modules/sh4-sh7785lcr/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/kernel-image b/debian/installer/modules/sh4-sh7785lcr/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/sh4-sh7785lcr/loop-modules b/debian/installer/modules/sh4-sh7785lcr/loop-modules
new file mode 100644
index 000000000..c1c948fa3
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/loop-modules
@@ -0,0 +1 @@
+#include <loop-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/md-modules b/debian/installer/modules/sh4-sh7785lcr/md-modules
new file mode 100644
index 000000000..26115e10b
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/md-modules
@@ -0,0 +1 @@
+#include <md-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/minix-modules b/debian/installer/modules/sh4-sh7785lcr/minix-modules
new file mode 100644
index 000000000..82b984372
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/minix-modules
@@ -0,0 +1 @@
+#include <minix-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/multipath-modules b/debian/installer/modules/sh4-sh7785lcr/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/nbd-modules b/debian/installer/modules/sh4-sh7785lcr/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/nic-modules b/debian/installer/modules/sh4-sh7785lcr/nic-modules
new file mode 100644
index 000000000..67761a69c
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/nic-modules
@@ -0,0 +1,6 @@
+3c59x ?
+8139too ?
+e100 ?
+e1000 ?
+ne2k-pci ?
+r8169 ?
diff --git a/debian/installer/modules/sh4-sh7785lcr/nic-shared-modules b/debian/installer/modules/sh4-sh7785lcr/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/nic-usb-modules b/debian/installer/modules/sh4-sh7785lcr/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/pata-modules b/debian/installer/modules/sh4-sh7785lcr/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/ppp-modules b/debian/installer/modules/sh4-sh7785lcr/ppp-modules
new file mode 100644
index 000000000..1f26aa1ee
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/ppp-modules
@@ -0,0 +1 @@
+#include <ppp-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/sata-modules b/debian/installer/modules/sh4-sh7785lcr/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/sound-modules b/debian/installer/modules/sh4-sh7785lcr/sound-modules
new file mode 100644
index 000000000..68395ab3d
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/sound-modules
@@ -0,0 +1 @@
+#include <sound-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/speakup-modules b/debian/installer/modules/sh4-sh7785lcr/speakup-modules
new file mode 100644
index 000000000..29592721a
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/speakup-modules
@@ -0,0 +1 @@
+#include <speakup-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/squashfs-modules b/debian/installer/modules/sh4-sh7785lcr/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/udf-modules b/debian/installer/modules/sh4-sh7785lcr/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/usb-serial-modules b/debian/installer/modules/sh4-sh7785lcr/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/sh4-sh7785lcr/xfs-modules b/debian/installer/modules/sh4-sh7785lcr/xfs-modules
new file mode 100644
index 000000000..98374e2bb
--- /dev/null
+++ b/debian/installer/modules/sh4-sh7785lcr/xfs-modules
@@ -0,0 +1 @@
+#include <xfs-modules>
diff --git a/debian/installer/modules/sound-modules b/debian/installer/modules/sound-modules
new file mode 100644
index 000000000..7bd30ee8e
--- /dev/null
+++ b/debian/installer/modules/sound-modules
@@ -0,0 +1,15 @@
+# Include sound drivers by default
+sound/**
+
+# Exclude any core/shared modules that aren't pulled in by dependencies
+sound/core/** -
+sound/drivers/** -
+sound/i2c/** -
+
+# Exclude synthesiser drivers
+snd-adlib -
+sound/**-synth -
+
+# Exclude soft-modem drivers
+sound/**-modem -
+snd-intel8x0m -
diff --git a/debian/installer/modules/sparc64/ata-modules b/debian/installer/modules/sparc64/ata-modules
new file mode 100644
index 000000000..b81c0f38b
--- /dev/null
+++ b/debian/installer/modules/sparc64/ata-modules
@@ -0,0 +1 @@
+#include <ata-modules>
diff --git a/debian/installer/modules/sparc64/btrfs-modules b/debian/installer/modules/sparc64/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/modules/sparc64/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/modules/sparc64/cdrom-core-modules b/debian/installer/modules/sparc64/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/modules/sparc64/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/modules/sparc64/crc-modules b/debian/installer/modules/sparc64/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/modules/sparc64/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/modules/sparc64/crypto-dm-modules b/debian/installer/modules/sparc64/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/modules/sparc64/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/modules/sparc64/crypto-modules b/debian/installer/modules/sparc64/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/modules/sparc64/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/modules/sparc64/ext4-modules b/debian/installer/modules/sparc64/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/modules/sparc64/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/modules/sparc64/f2fs-modules b/debian/installer/modules/sparc64/f2fs-modules
new file mode 100644
index 000000000..34359e041
--- /dev/null
+++ b/debian/installer/modules/sparc64/f2fs-modules
@@ -0,0 +1 @@
+#include <f2fs-modules>
diff --git a/debian/installer/modules/sparc64/fat-modules b/debian/installer/modules/sparc64/fat-modules
new file mode 100644
index 000000000..cce8fd30c
--- /dev/null
+++ b/debian/installer/modules/sparc64/fat-modules
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff --git a/debian/installer/modules/sparc64/fb-modules b/debian/installer/modules/sparc64/fb-modules
new file mode 100644
index 000000000..aba524d90
--- /dev/null
+++ b/debian/installer/modules/sparc64/fb-modules
@@ -0,0 +1 @@
+#include <fb-modules>
diff --git a/debian/installer/modules/sparc64/fuse-modules b/debian/installer/modules/sparc64/fuse-modules
new file mode 100644
index 000000000..0b6ba0c8c
--- /dev/null
+++ b/debian/installer/modules/sparc64/fuse-modules
@@ -0,0 +1 @@
+#include <fuse-modules>
diff --git a/debian/installer/modules/sparc64/i2c-modules b/debian/installer/modules/sparc64/i2c-modules
new file mode 100644
index 000000000..203a607e7
--- /dev/null
+++ b/debian/installer/modules/sparc64/i2c-modules
@@ -0,0 +1 @@
+#include <i2c-modules>
diff --git a/debian/installer/modules/sparc64/input-modules b/debian/installer/modules/sparc64/input-modules
new file mode 100644
index 000000000..5ecb595a4
--- /dev/null
+++ b/debian/installer/modules/sparc64/input-modules
@@ -0,0 +1 @@
+#include <input-modules>
diff --git a/debian/installer/modules/sparc64/isofs-modules b/debian/installer/modules/sparc64/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/modules/sparc64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/modules/sparc64/jfs-modules b/debian/installer/modules/sparc64/jfs-modules
new file mode 100644
index 000000000..7e4d912b9
--- /dev/null
+++ b/debian/installer/modules/sparc64/jfs-modules
@@ -0,0 +1 @@
+#include <jfs-modules>
diff --git a/debian/installer/modules/sparc64/kernel-image b/debian/installer/modules/sparc64/kernel-image
new file mode 100644
index 000000000..1d11b1921
--- /dev/null
+++ b/debian/installer/modules/sparc64/kernel-image
@@ -0,0 +1 @@
+#include <kernel-image>
diff --git a/debian/installer/modules/sparc64/md-modules b/debian/installer/modules/sparc64/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/modules/sparc64/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/modules/sparc64/multipath-modules b/debian/installer/modules/sparc64/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/modules/sparc64/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/modules/sparc64/nbd-modules b/debian/installer/modules/sparc64/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/modules/sparc64/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/modules/sparc64/nic-modules b/debian/installer/modules/sparc64/nic-modules
new file mode 100644
index 000000000..ad212bc8b
--- /dev/null
+++ b/debian/installer/modules/sparc64/nic-modules
@@ -0,0 +1,4 @@
+#include <nic-modules>
+
+eql
+skfp
diff --git a/debian/installer/modules/sparc64/nic-shared-modules b/debian/installer/modules/sparc64/nic-shared-modules
new file mode 100644
index 000000000..cc84b14dc
--- /dev/null
+++ b/debian/installer/modules/sparc64/nic-shared-modules
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff --git a/debian/installer/modules/sparc64/nic-usb-modules b/debian/installer/modules/sparc64/nic-usb-modules
new file mode 100644
index 000000000..c479669b4
--- /dev/null
+++ b/debian/installer/modules/sparc64/nic-usb-modules
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff --git a/debian/installer/modules/sparc64/pata-modules b/debian/installer/modules/sparc64/pata-modules
new file mode 100644
index 000000000..b0cd6337a
--- /dev/null
+++ b/debian/installer/modules/sparc64/pata-modules
@@ -0,0 +1 @@
+#include <pata-modules>
diff --git a/debian/installer/modules/sparc64/ppp-modules b/debian/installer/modules/sparc64/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/modules/sparc64/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/modules/sparc64/sata-modules b/debian/installer/modules/sparc64/sata-modules
new file mode 100644
index 000000000..01318c258
--- /dev/null
+++ b/debian/installer/modules/sparc64/sata-modules
@@ -0,0 +1 @@
+#include <sata-modules>
diff --git a/debian/installer/modules/sparc64/scsi-core-modules b/debian/installer/modules/sparc64/scsi-core-modules
new file mode 100644
index 000000000..6026fdf46
--- /dev/null
+++ b/debian/installer/modules/sparc64/scsi-core-modules
@@ -0,0 +1,6 @@
+#include <scsi-core-modules>
+
+# Support for virtual disk devices as a client under Sun Logical Domains.
+# Does not really belong here, but it's better than adding a new kernel
+# udeb just for this module.
+sunvdc ?
diff --git a/debian/installer/modules/sparc64/scsi-modules b/debian/installer/modules/sparc64/scsi-modules
new file mode 100644
index 000000000..263dcc9d4
--- /dev/null
+++ b/debian/installer/modules/sparc64/scsi-modules
@@ -0,0 +1,26 @@
+3w-9xxx
+3w-xxxx
+aacraid
+aic79xx
+aic7xxx
+aic94xx
+arcmsr
+atp870u ?
+dc395x
+dmx3191d
+hptiop
+initio
+ipr
+lpfc
+megaraid
+megaraid_sas
+mpt3sas
+mptsas
+mptspi
+qla1280 ?
+qla2xxx ?
+qla4xxx ?
+qlogicpti ?
+stex
+sun_esp
+sym53c8xx
diff --git a/debian/installer/modules/sparc64/squashfs-modules b/debian/installer/modules/sparc64/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/modules/sparc64/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/modules/sparc64/udf-modules b/debian/installer/modules/sparc64/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/modules/sparc64/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/modules/sparc64/ufs-modules b/debian/installer/modules/sparc64/ufs-modules
new file mode 100644
index 000000000..163ead095
--- /dev/null
+++ b/debian/installer/modules/sparc64/ufs-modules
@@ -0,0 +1 @@
+#include <ufs-modules>
diff --git a/debian/installer/modules/sparc64/usb-modules b/debian/installer/modules/sparc64/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/modules/sparc64/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/modules/sparc64/usb-serial-modules b/debian/installer/modules/sparc64/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/modules/sparc64/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/modules/sparc64/usb-storage-modules b/debian/installer/modules/sparc64/usb-storage-modules
new file mode 100644
index 000000000..272d95e2e
--- /dev/null
+++ b/debian/installer/modules/sparc64/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff --git a/debian/installer/modules/sparc64/xfs-modules b/debian/installer/modules/sparc64/xfs-modules
new file mode 100644
index 000000000..c020b5d39
--- /dev/null
+++ b/debian/installer/modules/sparc64/xfs-modules
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff --git a/debian/installer/modules/speakup-modules b/debian/installer/modules/speakup-modules
new file mode 100644
index 000000000..16822b914
--- /dev/null
+++ b/debian/installer/modules/speakup-modules
@@ -0,0 +1,15 @@
+speakup
+speakup_acntpc ?
+speakup_acntsa
+speakup_apollo
+speakup_audptr
+speakup_bns
+speakup_decext
+speakup_dectlk
+speakup_dtlk ?
+speakup_dummy
+speakup_keypc ?
+speakup_ltlk
+speakup_soft
+speakup_spkout
+speakup_txprt
diff --git a/debian/installer/modules/squashfs-modules b/debian/installer/modules/squashfs-modules
new file mode 100644
index 000000000..7c1157fa3
--- /dev/null
+++ b/debian/installer/modules/squashfs-modules
@@ -0,0 +1 @@
+squashfs
diff --git a/debian/installer/modules/udf-modules b/debian/installer/modules/udf-modules
new file mode 100644
index 000000000..97c604ff2
--- /dev/null
+++ b/debian/installer/modules/udf-modules
@@ -0,0 +1 @@
+udf
diff --git a/debian/installer/modules/ufs-modules b/debian/installer/modules/ufs-modules
new file mode 100644
index 000000000..19173e9aa
--- /dev/null
+++ b/debian/installer/modules/ufs-modules
@@ -0,0 +1 @@
+ufs
diff --git a/debian/installer/modules/uinput-modules b/debian/installer/modules/uinput-modules
new file mode 100644
index 000000000..42bc0053c
--- /dev/null
+++ b/debian/installer/modules/uinput-modules
@@ -0,0 +1 @@
+uinput
diff --git a/debian/installer/modules/usb-modules b/debian/installer/modules/usb-modules
new file mode 100644
index 000000000..68490ca76
--- /dev/null
+++ b/debian/installer/modules/usb-modules
@@ -0,0 +1,21 @@
+# Include USB host and dual-role drivers by default
+drivers/usb/host/**
+drivers/usb/c67x00/* ?
+drivers/usb/chipidea/* ?
+drivers/usb/dwc2/* ?
+drivers/usb/dwc3/* ?
+drivers/usb/isp1760/* ?
+drivers/usb/musb/* ?
+drivers/usb/renesas_usbhs/* ?
+
+# Exclude some obscure host drivers
+hwa-hc -
+sl811_cs -
+sl811-hcd -
+u132-hcd -
+whci-hcd -
+
+# Include USB PHY drivers by default
+drivers/phy/phy-*-usb* ?
+drivers/phy/*/phy-*-usb* ?
+drivers/usb/phy/* ?
diff --git a/debian/installer/modules/usb-serial-modules b/debian/installer/modules/usb-serial-modules
new file mode 100644
index 000000000..28f3aa760
--- /dev/null
+++ b/debian/installer/modules/usb-serial-modules
@@ -0,0 +1,28 @@
+# Include USB serial drivers by default
+drivers/usb/serial/*
+
+# Exclude drivers that are useless for serial consoles
+aircable -
+cyberjack -
+cypress_m8 -
+empeg -
+garmin_gps -
+ipaq -
+ipw -
+ir-usb -
+iuu_phoenix -
+kobil_sct -
+metro-usb -
+navman -
+omninet -
+opticon -
+option -
+qcaux -
+qcserial -
+sierra -
+symbolserial -
+usb_debug -
+usb_wwan -
+visor -
+wishbone-serial -
+xsens_mt -
diff --git a/debian/installer/modules/usb-storage-modules b/debian/installer/modules/usb-storage-modules
new file mode 100644
index 000000000..013c58cfc
--- /dev/null
+++ b/debian/installer/modules/usb-storage-modules
@@ -0,0 +1,2 @@
+# Include USB storage drivers by default
+drivers/usb/storage/*
diff --git a/debian/installer/modules/xfs-modules b/debian/installer/modules/xfs-modules
new file mode 100644
index 000000000..7bd8fb2ac
--- /dev/null
+++ b/debian/installer/modules/xfs-modules
@@ -0,0 +1,2 @@
+# Not available currently on all kernel versions, so marked optional.
+xfs ?