diff --git a/debian/changelog b/debian/changelog
index 750cfd461..b6d0498e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux (4.11-1~exp2) UNRELEASED; urgency=medium
+
+  * [armel/marvell] Change MQ_IOSCHED_DEADLINE, FW_LOADER, HWMON,
+    INPUT_MOUSEDEV, THERMAL, SERIAL_8250_PCI, SERIAL_8250_EXAR, NLS, PACKET
+    from built-in to modules (fixes FTBFS)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 03 May 2017 22:32:40 +0100
+
 linux (4.11-1~exp1) experimental; urgency=medium
 
   * New upstream release: https://kernelnewbies.org/Linux_4.11
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index b5b36919f..186ce11b5 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -89,6 +89,7 @@ CONFIG_ARM_THUMB=y
 ## file: block/Kconfig.iosched
 ##
 CONFIG_IOSCHED_DEADLINE=m
+CONFIG_MQ_IOSCHED_DEADLINE=m
 
 ##
 ## file: block/partitions/Kconfig
@@ -179,6 +180,11 @@ CONFIG_SATA_MV=m
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_ATA_GENERIC is not set
 
+##
+## file: drivers/base/Kconfig
+##
+CONFIG_FW_LOADER=m
+
 ##
 ## file: drivers/bluetooth/Kconfig
 ##
@@ -223,6 +229,7 @@ CONFIG_MV_XOR=y
 ##
 ## file: drivers/hwmon/Kconfig
 ##
+CONFIG_HWMON=m
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GPIO_FAN=m
@@ -239,6 +246,11 @@ CONFIG_I2C_CHARDEV=y
 ##
 CONFIG_I2C_MV64XXX=y
 
+##
+## file: drivers/input/Kconfig
+##
+CONFIG_INPUT_MOUSEDEV=m
+
 ##
 ## file: drivers/input/gameport/Kconfig
 ##
@@ -613,6 +625,7 @@ CONFIG_FB_XGI=m
 ##
 ## file: drivers/thermal/Kconfig
 ##
+CONFIG_THERMAL=m
 CONFIG_KIRKWOOD_THERMAL=m
 
 ##
@@ -620,6 +633,8 @@ CONFIG_KIRKWOOD_THERMAL=m
 ##
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_EXAR=m
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -675,6 +690,11 @@ CONFIG_ORION_WATCHDOG=m
 ##
 # CONFIG_FS_DAX is not set
 
+##
+## file: fs/nls/Kconfig
+##
+CONFIG_NLS=m
+
 ##
 ## file: fs/notify/fanotify/Kconfig
 ##
@@ -770,6 +790,11 @@ CONFIG_IPV6=m
 ##
 # CONFIG_NET_MPLS_GSO is not set
 
+##
+## file: net/packet/Kconfig
+##
+CONFIG_PACKET=m
+
 ##
 ## file: security/integrity/ima/Kconfig
 ##