diff --git a/debian/changelog b/debian/changelog
index ad4ea0c2d..b1cef7546 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -160,6 +160,7 @@ linux (4.0.4-1) UNRELEASED; urgency=medium
   * [armhf+arm64] Enabled generic SYSCON regmap reset driver
   * [arm64] Enable PCI support and related modules, adjusting udeb module lists
     for new modules.
+  * [arm64] Build XHCI platform drivers as a module.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 18 May 2015 00:00:06 +0100
 
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 12b148acc..a3cc2b834 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -194,8 +194,8 @@ CONFIG_SERIAL_8250_DW=y
 ## file: drivers/usb/host/Kconfig
 ##
 #. xhci-platform apparently does not build as module, so xhci_hcd can't be either
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PLATFORM=y
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=m
diff --git a/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch b/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch
index d4140e580..1856cc3f2 100644
--- a/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch
+++ b/debian/patches/features/arm64/usb-add-support-for-acpi-identification-to-xhci-platform.patch
@@ -14,6 +14,10 @@ There were no regressions or error messages on the machines
 without platform XHCI.
 
 Signed-off-by: Mark Langsdorf <mlangsdo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+[ ijc -- allow build as a module, otherwise cannot see various core
+  symbols, like xhci_resume or usb_add_hcd which are in modules. xhci-hcd-plat
+  can be built as a module from v3.18. ]
+
 ---
 Changes from v2
 	Replaced tristate with a boolean as the driver doesn't
@@ -35,7 +39,7 @@ Changes from v1
  
  config USB_XHCI_PLATFORM
 -	tristate
-+	boolean "xHCI platform driver support"
++	tristate "xHCI platform driver support"
 +	---help---
 +	  Say 'Y' to enable the support for the xHCI host controller
 +	  as a platform device. Many ARM SoCs provide USB this way.