diff --git a/debian/changelog b/debian/changelog
index 73832c5eb..01aa0c5ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,9 @@ linux (4.12.6-1) UNRELEASED; urgency=medium
   * [arm64] enable MMC_SDHCI_XENON and MVNETA for Espressobin and enable
     respective device in its device tree (Closes: #871049)
 
+  [ Roger Shimizu ]
+  * [armel] Change NAND related stuff to modules (fixes FTBFS)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 18 Jul 2017 13:26:41 +0100
 
 linux (4.12.2-1~exp1) experimental; urgency=medium
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 186ce11b5..0c3059760 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -363,8 +363,8 @@ CONFIG_NFTL=m
 ##
 ## file: drivers/mtd/chips/Kconfig
 ##
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 ## choice: Flash cmd/query data swapping
 CONFIG_MTD_CFI_NOSWAP=y
@@ -384,9 +384,9 @@ CONFIG_MTD_CFI_I4=y
 # CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_OTP is not set
 #. Needed e.g. on QNAP devices
-CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_INTELEXT=m
 #. Needed e.g. on D-Link DNS-323, Buffalo KuroBox-Pro, Buffalo Linkstation LS-GL / LS-WTGL, etc
-CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_AMDSTD=m
 CONFIG_MTD_CFI_STAA=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
@@ -413,10 +413,10 @@ CONFIG_MTD_PHYSMAP_OF=y
 ##
 ## file: drivers/mtd/nand/Kconfig
 ##
-CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_NAND_ORION=m
 
 ##
 ## file: drivers/mtd/onenand/Kconfig
diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/armel/modules/armel-marvell/mtd-modules
index 5fcac1e0a..a26280d32 100644
--- a/debian/installer/armel/modules/armel-marvell/mtd-modules
+++ b/debian/installer/armel/modules/armel-marvell/mtd-modules
@@ -1,2 +1,7 @@
 #include <mtd-modules>
 m25p80
+cfi_probe
+gen_probe
+jedec_probe
+nand
+orion_nand