diff --git a/debian/changelog b/debian/changelog
index b3c7fdd37..829967e4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -205,6 +205,8 @@ linux (4.14.15-1) UNRELEASED; urgency=medium
 
   [ Ben Hutchings ]
   * bpf: Avoid ABI change in 4.14.14
+  * usbip: Reduce USBIP_VHCI_HC_PORTS to 15, the maximum allowed for SuperSpeed
+    hubs (Closes: #878866)
 
   [ Riku Voipio ]
   * [arm64] build in reset drivers
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 94215d3df..ad810bc6a 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1728,7 +1728,7 @@ CONFIG_USB_SL811_CS=m
 ##
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_VHCI_HC_PORTS=31
+CONFIG_USBIP_VHCI_HC_PORTS=15
 CONFIG_USBIP_VHCI_NR_HCS=8
 CONFIG_USBIP_HOST=m
 # CONFIG_USBIP_DEBUG is not set