diff --git a/debian/changelog b/debian/changelog
index ce014f68e..326a12efa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
       + Disable MACH_DNS323
       + Change MTD_CFI_AMDSTD from built-in to module
     - input: Disable KEYBOARD_ATKBD
+    - mtd: Change JFFS2_FS, MTD_SPI_NOR, and M25P80 from built-in to modules
 
  -- Ian Campbell <ijc@debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index ab119114f..588eeb7d3 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -360,7 +360,6 @@ CONFIG_MTD_CFI_STAA=m
 ## file: drivers/mtd/devices/Kconfig
 ##
 # CONFIG_MTD_PMC551 is not set
-CONFIG_MTD_M25P80=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -391,7 +390,7 @@ CONFIG_MTD_NAND_ORION=y
 ##
 ## file: drivers/mtd/spi-nor/Kconfig
 ##
-CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPI_NOR=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -639,11 +638,6 @@ CONFIG_FB=m
 ##
 CONFIG_ORION_WATCHDOG=m
 
-##
-## file: fs/jffs2/Kconfig
-##
-CONFIG_JFFS2_FS=y
-
 ##
 ## file: kernel/trace/Kconfig
 ##
diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/armel/modules/armel-marvell/mtd-modules
new file mode 100644
index 000000000..5fcac1e0a
--- /dev/null
+++ b/debian/installer/armel/modules/armel-marvell/mtd-modules
@@ -0,0 +1,2 @@
+#include <mtd-modules>
+m25p80