diff --git a/debian/changelog b/debian/changelog
index 253e99178..fe6de5a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ linux (4.9.6-2) UNRELEASED; urgency=medium
   * Bump ABI to 2
   * [or1k] Remove configuration, as the port has been abandoned
   * [arm64] Enable KEXEC (Closes: #852747)
+  * [arm64,armhf,x86] usb: gadget: Enable USB_CONFIGFS, USB_ETH, USB_GADGETFS,
+    USB_FUNCTIONFS, USB_G_SERIAL as modules;
+    USB_CONFIGFS_{SERIAL,ACM,OBEX,NCM,ECM,ECM_SUBSET,RNDIS,EEM,PHONET,MASS_STORAGE},
+    USB_CONFIGFS_F_{LB_SS,LS,UAC1,UAC2,MIDI,HID,UVC,PRINTER}, USB_ETH_RNDIS,
+    USB_FUNCTIONFS_{ETH,RNDIS,GENERIC} (thanks to Riku Voipio)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Fri, 27 Jan 2017 18:14:31 +0000
 
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 5fe1fd751..9092a250e 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1114,9 +1114,6 @@ CONFIG_USB_GADGET=m
 ##
 ## file: drivers/usb/gadget/legacy/Kconfig
 ##
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
 CONFIG_USB_G_NOKIA=m
 
 ##
diff --git a/debian/config/config b/debian/config/config
index c744073f9..d6ec09462 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4609,6 +4609,37 @@ CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+
+##
+## file: drivers/usb/gadget/legacy/Kconfig
+##
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_G_SERIAL=m
 
 ##
 ## file: drivers/usb/gadget/udc/Kconfig