diff --git a/dom0/aux-tools/qubes-dom0.modules b/dom0/aux-tools/qubes-dom0.modules
index 60965743..31431c69 100755
--- a/dom0/aux-tools/qubes-dom0.modules
+++ b/dom0/aux-tools/qubes-dom0.modules
@@ -1 +1 @@
-modprobe pciback
+modprobe pciback 2> /dev/null || modprobe xen-pciback
diff --git a/dom0/dracut/modules.d/90qubes-pciback/installkernel b/dom0/dracut/modules.d/90qubes-pciback/installkernel
index e360576f..427e99d3 100755
--- a/dom0/dracut/modules.d/90qubes-pciback/installkernel
+++ b/dom0/dracut/modules.d/90qubes-pciback/installkernel
@@ -1,2 +1,3 @@
 #!/bin/bash
-instmods pciback
+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/dom0/dracut/modules.d/90qubes-pciback/qubes-pciback.sh b/dom0/dracut/modules.d/90qubes-pciback/qubes-pciback.sh
index cc76ea39..2ba649be 100755
--- a/dom0/dracut/modules.d/90qubes-pciback/qubes-pciback.sh
+++ b/dom0/dracut/modules.d/90qubes-pciback/qubes-pciback.sh
@@ -4,5 +4,5 @@
 HIDE_PCI=`lspci -mm -n | grep '^[^ ]* "02'|awk '{ ORS="";print "(" $1 ")";}'`
 
 # ... and hide them so that Dom0 doesn't load drivers for them
-modprobe pciback hide=$HIDE_PCI
+modprobe pciback hide=$HIDE_PCI 2> /dev/null || modprobe xen-pciback hide=$HIDE_PCI
 
diff --git a/dom0/init.d/qubes_core b/dom0/init.d/qubes_core
index 26ca4189..a3974289 100755
--- a/dom0/init.d/qubes_core
+++ b/dom0/init.d/qubes_core
@@ -20,7 +20,7 @@
 start()
 {
     echo -n $"Executing Qubes Core scripts:"
-    modprobe evtchn
+    modprobe evtchn 2> /dev/null || modprobe xen-evtchn
     chgrp qubes /etc/xen
     chmod 710 /etc/xen
     chgrp qubes /var/run/xenstored/*
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 06bbbc91..b1d532f5 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -231,7 +231,7 @@ if ! [ -e /etc/sysconfig/network ]; then
 fi
 
 # Load evtchn module - xenstored needs it
-modprobe evtchn
+modprobe evtchn 2> /dev/null || modprobe xen-evtchn
 service xenstored start
 
 if ! [ -e /var/lib/qubes/qubes.xml ]; then