diff --git a/dom0/restore/qubes_prepare_saved_domain.sh b/dom0/restore/qubes_prepare_saved_domain.sh
index a1bf0770..bd1da7e9 100755
--- a/dom0/restore/qubes_prepare_saved_domain.sh
+++ b/dom0/restore/qubes_prepare_saved_domain.sh
@@ -42,7 +42,7 @@ if [ -n "$ENCODED_SCRIPT" ] ; then
 fi
 #set -x
 xenstore-write /local/domain/$ID/qubes_save_request 1 
-xenstore-watch /local/domain/$ID/device/qubes_used_mem
+xenstore-watch-qubes /local/domain/$ID/device/qubes_used_mem
 xenstore-read /local/domain/$ID/qubes_gateway | \
 	cut -d . -f 2 | tr -d "\n" > $VMDIR/netvm_id.txt
 xm block-detach $1 /dev/xvdb
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 9fc3924c..1ac8c067 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -94,7 +94,7 @@ cp ../common/meminfo-writer $RPM_BUILD_ROOT/usr/lib/qubes/
 cp ../qrexec/qrexec_daemon $RPM_BUILD_ROOT/usr/lib/qubes/
 cp ../qrexec/qrexec_client $RPM_BUILD_ROOT/usr/lib/qubes/
 
-cp restore/xenstore-watch restore/qvm-create-default-dvm $RPM_BUILD_ROOT/usr/bin
+cp restore/xenstore-watch restore/qvm-create-default-dvm $RPM_BUILD_ROOT/usr/bin/xenstore-watch-qubes
 cp restore/qubes_restore restore/xenfreepages $RPM_BUILD_ROOT/usr/lib/qubes
 cp restore/qubes_prepare_saved_domain.sh  $RPM_BUILD_ROOT/usr/lib/qubes
 cp restore/qfile-daemon-dvm $RPM_BUILD_ROOT/usr/lib/qubes
@@ -279,7 +279,7 @@ fi
 /usr/lib64/pm-utils/sleep.d/01qubes-sync-vms-clock
 /usr/lib64/pm-utils/sleep.d/01qubes-suspend-netvm
 /usr/lib64/pm-utils/sleep.d/02qubes-pause-vms
-/usr/bin/xenstore-watch
+/usr/bin/xenstore-watch-qubes
 /usr/lib/qubes/qubes_restore
 /usr/lib/qubes/qubes_prepare_saved_domain.sh
 /etc/xen/scripts/block.qubes