diff --git a/debian/changelog b/debian/changelog
index dd279335a..a0ade93f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ linux (4.15~rc8-1~exp2) UNRELEASED; urgency=medium
 
   [ Ben Hutchings ]
   * Enable CGROUP_BPF (except for armel) (Closes: #872560)
+  * usb: Enable USBIP_CORE, USBIP_VHCI_HCD, USBIP_HOST, USBIP_VUDC as
+    modules on all architectures (Closes: #888042)
 
  -- Bastian Blank <waldi@debian.org>  Thu, 18 Jan 2018 09:14:57 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 3821bc5bb..5f8039dd3 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5086,8 +5086,13 @@ CONFIG_UCSI_ACPI=m
 ##
 ## file: drivers/usb/usbip/Kconfig
 ##
-# CONFIG_USBIP_CORE is not set
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=31
+CONFIG_USBIP_VHCI_NR_HCS=8
+CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
 
 ##
 ## file: drivers/usb/wusbcore/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 9c5e363fd..533340bbd 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1722,16 +1722,6 @@ CONFIG_USB_SL811_HCD=m
 # CONFIG_USB_SL811_HCD_ISO is not set
 CONFIG_USB_SL811_CS=m
 
-##
-## file: drivers/usb/usbip/Kconfig
-##
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=31
-CONFIG_USBIP_VHCI_NR_HCS=8
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
-
 ##
 ## file: drivers/vfio/Kconfig
 ##