diff --git a/config-generic b/config-generic
index 6d8161278..246b37dbf 100644
--- a/config-generic
+++ b/config-generic
@@ -5039,7 +5039,10 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_DVB_CXD2099 is not set
 # CONFIG_DVB_RTL2832_SDR is not set
 # CONFIG_PWM_FSL_FTM is not set
-# CONFIG_USBIP_CORE is not set
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
 # CONFIG_INTEL_MEI is not set
 # CONFIG_VT6655 is not set
 # CONFIG_USB_WPAN_HCD is not set
diff --git a/kernel.spec b/kernel.spec
index cb2e6f276..9f57d87e9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2250,6 +2250,7 @@ fi
 - Linux v3.18.1
 - CVE-2014-XXXX isofs: infinite loop in CE record entries (rhbz 1175235 1175250)
 - Enable TCM_USER (rhbz 1174986)
+- Enable USBIP in modules-extra from Johnathan Dieter (rhbz 1169478)
 
 * Tue Dec 16 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-2
 - Add patch from Josh Stone to restore var-tracking via Kconfig (rhbz 1126580)
diff --git a/mod-extra.list b/mod-extra.list
index 6e980f6aa..9794fefb0 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -189,3 +189,6 @@ orinoco_plx.ko
 orinoco_pci.ko
 orinoco_nortel.ko
 orinoco_usb.ko
+usbip-core.ko
+vhci-hcd.ko
+usbip-host.ko