diff --git a/dom0/init.d/qubes_core b/dom0/init.d/qubes_core
index 7e3e86dc..1d286a8d 100755
--- a/dom0/init.d/qubes_core
+++ b/dom0/init.d/qubes_core
@@ -21,25 +21,7 @@ start()
 {
     echo -n $"Executing Qubes Core scripts:"
     modprobe evtchn 2> /dev/null || modprobe xen-evtchn
-    chgrp qubes /etc/xen
-    chmod 710 /etc/xen
-    chgrp qubes /var/run/xenstored/*
-    chmod 660 /var/run/xenstored/*
-    chgrp qubes /var/lib/xen
-    chmod 770 /var/lib/xen
-    chgrp qubes /var/log/xen
-    chmod 770 /var/log/xen
-    chgrp qubes /proc/xen/privcmd
-    chmod 660 /proc/xen/privcmd
-    chgrp qubes /dev/xen/evtchn
-    chmod 660 /dev/xen/evtchn
-    touch /var/run/qubes/xl-lock
-    chgrp qubes /var/run/qubes/xl-lock
-    chmod 660 /var/run/qubes/xl-lock
-    chgrp -R qubes /var/log/xen
-    chmod -R g+rX /var/log/xen
-    chmod g+s /var/log/xen/console
-    mkdir -p /var/run/xen-hotplug
+    /usr/lib/qubes/fix_dir_perms.sh
 
     xenstore-write /local/domain/0/name dom0
     DOM0_MAXMEM=`/usr/sbin/xl info | grep total_memory | awk '{ print $3 }'`
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 62aefa24..bc0cc918 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -113,6 +113,7 @@ cp aux-tools/qubes-receive-updates $RPM_BUILD_ROOT/usr/lib/qubes/
 cp ../misc/block_add_change $RPM_BUILD_ROOT/usr/lib/qubes/
 cp ../misc/block_remove $RPM_BUILD_ROOT/usr/lib/qubes/
 cp ../misc/block_cleanup $RPM_BUILD_ROOT/usr/lib/qubes/
+cp aux-tools/fix_dir_perms.sh $RPM_BUILD_ROOT/usr/lib/qubes/
 
 mkdir -p $RPM_BUILD_ROOT/etc/qubes_rpc/policy
 cp ../qubes_rpc/qubes.Filecopy.policy $RPM_BUILD_ROOT/etc/qubes_rpc/policy/qubes.Filecopy
@@ -291,6 +292,7 @@ fi
 
 %triggerin -- xen-runtime
 sed -i 's/\/block /\/block.qubes /' /etc/udev/rules.d/xen-backend.rules
+/usr/lib/qubes/fix_dir_perms.sh
 
 %triggerin -- xorg-x11-drv-vmmouse
 mv -f /lib/udev/rules.d/69-xorg-vmmouse.rules /var/lib/qubes/removed-udev-scripts/ 2> /dev/null || :
@@ -354,6 +356,7 @@ fi
 /usr/lib/qubes/block_add_change
 /usr/lib/qubes/block_remove
 /usr/lib/qubes/block_cleanup
+/usr/lib/qubes/fix_dir_perms.sh
 %attr(4750,root,qubes) /usr/lib/qubes/qfile-dom0-unpacker
 %attr(770,root,qubes) %dir /var/lib/qubes
 %attr(770,root,qubes) %dir /var/lib/qubes/vm-templates