diff --git a/debian/changelog b/debian/changelog
index 61fd07ecd..db2fd05c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux (4.19~rc7-1~exp2) UNRELEASED; urgency=medium
 
   * linux-perf: Enable verbose output for build-time feature detection
   * udeb: Define mtd-core-modules package to contain MTD core if not built-in
+  * udeb: Move MTD core from nic-modules to mtd-core-modules
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 08 Oct 2018 18:45:06 +0100
 
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/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/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/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/mips-4kc-malta/mtd-core-modules b/debian/installer/modules/mips-4kc-malta/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/mips-4kc-malta/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-modules>
diff --git a/debian/installer/modules/mipsel-loongson-3/mtd-core-modules b/debian/installer/modules/mipsel-loongson-3/mtd-core-modules
new file mode 100644
index 000000000..28fdada60
--- /dev/null
+++ b/debian/installer/modules/mipsel-loongson-3/mtd-core-modules
@@ -0,0 +1 @@
+#include <mtd-core-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/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/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/package-list b/debian/installer/package-list
index d06265e11..abfd62968 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -27,7 +27,7 @@ Description: Linux kernel image and core modules for the Debian installer
  Debian system.
 
 Package: nic-modules
-Depends: kernel-image, nic-shared-modules, i2c-modules, crc-modules, zlib-modules
+Depends: kernel-image, nic-shared-modules, i2c-modules, crc-modules, zlib-modules, mtd-core-modules
 Provides: nic-extra-modules
 Priority: standard
 Description: NIC drivers