diff --git a/debian/changelog b/debian/changelog
index 1217469b8..112718e7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ linux (4.13~rc6-1~exp1) UNRELEASED; urgency=medium
   [ Roger Shimizu ]
   * [armel] Disable CONFIG_STRICT_KERNEL_RWX, which will save about 3MB
     on linux Image (before compression).
+  * [armel] Change MTD_OF_PARTS, MTD_BLOCK, and MTD_PHYSMAP_OF from
+    built-in to modules.
+    Also change all RTC related except RTC_DRV_MV, which includes
+    RTC_DRV_DS1307, RTC_DRV_RS5C372, RTC_DRV_PCF8563, RTC_DRV_M41T80,
+    and RTC_DRV_S35390A, to modules. Because most marvell boards use
+    RTC_DRV_MV. (above two fix FTBFS)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 19 Aug 2017 22:37:38 +0100
 
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 24d54814b..d53a4b5f5 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -351,8 +351,8 @@ CONFIG_MTD=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_OF_PARTS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_BLOCK=m
 CONFIG_FTL=m
 CONFIG_NFTL=m
 # CONFIG_NFTL_RW is not set
@@ -406,7 +406,7 @@ CONFIG_MTD_CFI_STAA=m
 ## file: drivers/mtd/maps/Kconfig
 ##
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_IMPA7 is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_PLATRAM is not set
@@ -542,11 +542,11 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 ##
 ## file: drivers/rtc/Kconfig
 ##
-CONFIG_RTC_DRV_DS1307=y
-CONFIG_RTC_DRV_RS5C372=y
-CONFIG_RTC_DRV_PCF8563=y
-CONFIG_RTC_DRV_M41T80=y
-CONFIG_RTC_DRV_S35390A=y
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_MV=y
 
 ##
diff --git a/debian/installer/armel/modules/armel-marvell/mtd-modules b/debian/installer/armel/modules/armel-marvell/mtd-modules
index a26280d32..2a064755f 100644
--- a/debian/installer/armel/modules/armel-marvell/mtd-modules
+++ b/debian/installer/armel/modules/armel-marvell/mtd-modules
@@ -5,3 +5,6 @@ gen_probe
 jedec_probe
 nand
 orion_nand
+ofpart
+mtdblock
+physmap_of