diff --git a/0166-load-xhci-pci.patch b/0166-load-xhci-pci.patch
new file mode 100644
index 0000000..11c9159
--- /dev/null
+++ b/0166-load-xhci-pci.patch
@@ -0,0 +1,16 @@
+From: Bernhard M. Wiedemann <bwiedemann+dracut@suse.de>
+Subject: load xhci-pci on Linux-3.18+ to allow USB-keyboard to give LUKS PW
+References: bnc#911319
+Index: dracut-037/modules.d/90kernel-modules/module-setup.sh
+===================================================================
+--- dracut-037.orig/modules.d/90kernel-modules/module-setup.sh
++++ dracut-037/modules.d/90kernel-modules/module-setup.sh
+@@ -41,7 +41,7 @@ installkernel() {
+             ehci-hcd ehci-pci ehci-platform \
+             ohci-hcd ohci-pci \
+             uhci-hcd \
+-            xhci-hcd
++            xhci-hcd xhci-pci
+ 
+         instmods yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \
+             atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \
diff --git a/dracut.changes b/dracut.changes
index b84c2ed..ceb9c2c 100644
--- a/dracut.changes
+++ b/dracut.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jan  3 04:53:20 UTC 2015 - bwiedemann@suse.com
+
+- add 0166-load-xhci-pci.patch
+  load xhci-pci on Linux-3.18+ to allow USB-keyboard to give LUKS PW
+  (bnc#911319)
+
 -------------------------------------------------------------------
 Wed Dec 17 09:15:56 UTC 2014 - schwab@suse.de
 
diff --git a/dracut.spec b/dracut.spec
index b8a062b..3b49427 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dracut
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -187,6 +187,7 @@ Patch162:       0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch
 Patch163:       0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch
 Patch164:       0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch
 Patch165:       0165-Order-root-fsck-after-pre-mount.patch
+Patch166:       0166-load-xhci-pci.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -396,6 +397,7 @@ and its cryptography during startup.
 %patch163 -p1
 %patch164 -p1
 %patch165 -p1
+%patch166 -p1
 
 %build
 %configure\