diff --git a/dom0/dracut/dracut.conf.d/luks-aesni-missing-drivers.conf b/dom0/dracut/dracut.conf.d/luks-aesni-missing-drivers.conf
index 558e89eb..6cb4ab8b 100644
--- a/dom0/dracut/dracut.conf.d/luks-aesni-missing-drivers.conf
+++ b/dom0/dracut/dracut.conf.d/luks-aesni-missing-drivers.conf
@@ -1,4 +1,4 @@
 # Apprently some of the drivers required when using a processor with AESNI for LUKS
 # are missing in the initramfs, so lets include them manually here:
 
-add_drivers="xts aesni-intel aes-x86_64 crc32c-intel fpu ghash-clmulni-intel salsa20-x86_64 twofish-x86_64"
+add_drivers+=" xts aesni-intel aes-x86_64 crc32c-intel fpu ghash-clmulni-intel salsa20-x86_64 twofish-x86_64 "
diff --git a/dom0/dracut/dracut.conf.d/qubes-pciback.conf b/dom0/dracut/dracut.conf.d/qubes-pciback.conf
index 18c3bc00..f96604b5 100644
--- a/dom0/dracut/dracut.conf.d/qubes-pciback.conf
+++ b/dom0/dracut/dracut.conf.d/qubes-pciback.conf
@@ -2,4 +2,4 @@
 # detecting and hiding all networking devices at boot time
 # so that Dom0 doesn't load drivers for them...
 
-add_dracutmodules="qubes-pciback"
+add_dracutmodules+=" qubes-pciback "
diff --git a/dom0/dracut/modules.d/90qubes-pciback/module-setup.sh b/dom0/dracut/modules.d/90qubes-pciback/module-setup.sh
new file mode 100755
index 00000000..9118a14f
--- /dev/null
+++ b/dom0/dracut/modules.d/90qubes-pciback/module-setup.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+install() {
+    inst_hook cmdline 02 "$moddir/qubes-pciback.sh"
+    inst lspci
+    inst grep
+    inst awk
+}
+
+installkernel() {
+    modinfo -k $kernel pciback > /dev/null 2>&1 && instmods pciback
+    modinfo -k $kernel xen-pciback > /dev/null 2>&1 && instmods xen-pciback
+}
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 8a0ec81b..4c21afd7 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -27,6 +27,11 @@
 
 %{!?version: %define version %(cat version_dom0)}
 
+%define _dracutmoddir	/usr/lib/dracut/modules.d
+%if %{fedora} < 17
+%define _dracutmoddir   /usr/share/dracut/modules.d
+%endif
+
 Name:		qubes-core-dom0
 Version:	%{version}
 Release:	1%{dist}
@@ -214,8 +219,8 @@ install -m 0644 qubes-guid.desktop $RPM_BUILD_ROOT/etc/xdg/autostart/
 mkdir -p $RPM_BUILD_ROOT/etc/dracut.conf.d
 cp dracut/dracut.conf.d/* $RPM_BUILD_ROOT/etc/dracut.conf.d/
 
-mkdir -p $RPM_BUILD_ROOT/usr/share/dracut/modules.d
-cp -r dracut/modules.d/* $RPM_BUILD_ROOT/usr/share/dracut/modules.d/
+mkdir -p $RPM_BUILD_ROOT%{_dracutmoddir}
+cp -r dracut/modules.d/* $RPM_BUILD_ROOT%{_dracutmoddir}/
 
 %post
 
@@ -449,5 +454,5 @@ fi
 %attr(0644,root,root) /etc/cron.daily/qubes-dom0-updates.cron
 %attr(0644,root,root) /etc/cron.d/qubes-sync-clock.cron
 /etc/dracut.conf.d/*
-%dir /usr/share/dracut/modules.d/90qubes-pciback
-/usr/share/dracut/modules.d/90qubes-pciback/*
+%dir %{_dracutmoddir}/90qubes-pciback
+%{_dracutmoddir}/90qubes-pciback/*