diff --git a/debian/changelog b/debian/changelog
index b9df03bbb..2b14850bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+linux (4.11.3-1~exp2) UNRELEASED; urgency=medium
+
+  [ John Paul Adrian Glaubitz ]
+  * [m68k] udeb: Build affs-modules package
+  * [m68k] udeb: Build hfs-modules package
+  * [m68k] udeb: Build nic-modules package
+  * [m68k] udeb: Build pata-modules package
+  * [m68k] udeb: Build scsi-core-modules package
+  * [m68k] udeb: Move non-shared modules from nic-shared-modules to nic-modules
+  * [m68k] udeb: Add buddha, falconide, gayle, macide, q40ide to pata-modules
+  * [m68k] udeb: Add atari_scsi, mac_esp, mac_scsi to scsi-modules
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 06 Jun 2017 20:43:11 +0100
+
 linux (4.11.3-1~exp1) experimental; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/installer/m68k/modules/m68k/affs-modules b/debian/installer/m68k/modules/m68k/affs-modules
new file mode 100644
index 000000000..21d616a1c
--- /dev/null
+++ b/debian/installer/m68k/modules/m68k/affs-modules
@@ -0,0 +1 @@
+#include <affs-modules>
diff --git a/debian/installer/m68k/modules/m68k/hfs-modules b/debian/installer/m68k/modules/m68k/hfs-modules
new file mode 100644
index 000000000..57d12f649
--- /dev/null
+++ b/debian/installer/m68k/modules/m68k/hfs-modules
@@ -0,0 +1 @@
+#include <hfs-modules>
diff --git a/debian/installer/m68k/modules/m68k/nic-modules b/debian/installer/m68k/modules/m68k/nic-modules
new file mode 100644
index 000000000..d17bfb788
--- /dev/null
+++ b/debian/installer/m68k/modules/m68k/nic-modules
@@ -0,0 +1,15 @@
+#include <nic-modules>
+
+a2065 ?
+apne ?
+ariadne ?
+ariadne2 ?
+atari_ethernec ?
+atarilance ?
+hydra ?
+mac8390 ?
+mac89x0 ?
+macsonic ?
+ne ?
+smc91x ?
+zorro8390 ?
diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/m68k/modules/m68k/nic-shared-modules
index 5bff60c2d..d6bb0f96d 100644
--- a/debian/installer/m68k/modules/m68k/nic-shared-modules
+++ b/debian/installer/m68k/modules/m68k/nic-shared-modules
@@ -1,20 +1,8 @@
 #include <nic-shared-modules>
+
 82596 ?
 8390 ?
 8390p ?
 7990 ?
-a2065 ?
-apne ?
-ariadne ?
-ariadne2 ?
-atarilance ?
 dummy
-hydra ?
-mac8390 ?
-mac89x0 ?
-macsonic ?
-zorro8390 ?
-ne ?
-atari_ethernec ?
-smc91x ?
 libphy
diff --git a/debian/installer/m68k/modules/m68k/pata-modules b/debian/installer/m68k/modules/m68k/pata-modules
new file mode 100644
index 000000000..b366588c7
--- /dev/null
+++ b/debian/installer/m68k/modules/m68k/pata-modules
@@ -0,0 +1,7 @@
+#include <pata-modules>
+
+buddha
+falconide
+gayle
+macide
+q40ide
diff --git a/debian/installer/m68k/modules/m68k/scsi-core-modules b/debian/installer/m68k/modules/m68k/scsi-core-modules
new file mode 100644
index 000000000..dd65d6614
--- /dev/null
+++ b/debian/installer/m68k/modules/m68k/scsi-core-modules
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff --git a/debian/installer/m68k/modules/m68k/scsi-modules b/debian/installer/m68k/modules/m68k/scsi-modules
index 3a411a322..6cbb16b96 100644
--- a/debian/installer/m68k/modules/m68k/scsi-modules
+++ b/debian/installer/m68k/modules/m68k/scsi-modules
@@ -1 +1,5 @@
 sg
+
+atari_scsi
+mac_esp
+mac_scsi