diff --git a/proxyvm/bin/qubes_firewall b/proxyvm/bin/qubes_firewall
index 2a0963d..fbac295 100755
--- a/proxyvm/bin/qubes_firewall
+++ b/proxyvm/bin/qubes_firewall
@@ -32,5 +32,5 @@ while true; do
 	fi
 
 	# Wait for changes in xenstore file
-	/usr/bin/xenstore-watch $XENSTORE_IPTABLES
+	/usr/bin/xenstore-watch-qubes $XENSTORE_IPTABLES
 done
diff --git a/proxyvm/bin/qubes_netwatcher b/proxyvm/bin/qubes_netwatcher
index 9b9f279..f250cc1 100755
--- a/proxyvm/bin/qubes_netwatcher
+++ b/proxyvm/bin/qubes_netwatcher
@@ -24,8 +24,8 @@ while true; do
 			/usr/bin/xenstore-write qubes_netvm_external_ip "$CURR_NETCFG"
 		fi
 
-		/usr/bin/xenstore-watch /local/domain/$NET_DOMID/qubes_netvm_external_ip
+		/usr/bin/xenstore-watch-qubes /local/domain/$NET_DOMID/qubes_netvm_external_ip
 	else
-		/usr/bin/xenstore-watch qubes_netvm_domid
+		/usr/bin/xenstore-watch-qubes qubes_netvm_domid
 	fi
 done
diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec
index 9e484d0..74b7a5e 100644
--- a/rpm_spec/core-commonvm.spec
+++ b/rpm_spec/core-commonvm.spec
@@ -71,7 +71,7 @@ install -m 644 RPM-GPG-KEY-qubes* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 mkdir -p $RPM_BUILD_ROOT/sbin
 cp qubes_serial_login $RPM_BUILD_ROOT/sbin
 mkdir -p $RPM_BUILD_ROOT/usr/bin
-cp xenstore-watch $RPM_BUILD_ROOT/usr/bin
+cp xenstore-watch $RPM_BUILD_ROOT/usr/bin/xenstore-watch-qubes
 mkdir -p $RPM_BUILD_ROOT/etc
 cp serial.conf $RPM_BUILD_ROOT/var/lib/qubes/
 mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
@@ -223,6 +223,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/yum.repos.d/qubes%{dist}.repo
 /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
 /sbin/qubes_serial_login
-/usr/bin/xenstore-watch
+/usr/bin/xenstore-watch-qubes
 /etc/udev/rules.d/qubes_network.rules
 /usr/lib/qubes/setup_ip