diff --git a/debian/changelog b/debian/changelog
index d4154b8d1..108e5764b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.4~rc8-1~exp2) UNRELEASED; urgency=medium
+
+  * [armhf] Enable EXTCON_USB_GPIO, ENSORS_GPIO_FAN as modules, and
+    USB_DWC3_DUAL_ROLE instead of USB_DWC3_HOST (Closes: #810048)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Wed, 06 Jan 2016 01:28:46 +0000
+
 linux (4.4~rc8-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index bef9ace03..e86061944 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -222,6 +222,7 @@ CONFIG_TI_EDMA=y
 ##
 CONFIG_EXTCON=m
 CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_USB_GPIO=m
 
 ##
 ## file: drivers/firmware/Kconfig
@@ -319,6 +320,7 @@ CONFIG_OMAP_SSI=m
 ## file: drivers/hwmon/Kconfig
 ##
 CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GPIO_FAN=m
 
 ##
 ## file: drivers/hwspinlock/Kconfig
@@ -959,7 +961,7 @@ CONFIG_USB_DWC2_DUAL_ROLE=y
 ##
 CONFIG_USB_DWC3=m
 ## choice: DWC3 Mode Selection
-CONFIG_USB_DWC3_HOST=y
+CONFIG_USB_DWC3_DUAL_ROLE=y
 ## end choice
 CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_EXYNOS=m