diff --git a/qrexec/qrexec-daemon.c b/qrexec/qrexec-daemon.c
index 2f66a25..2a4dcc4 100644
--- a/qrexec/qrexec-daemon.c
+++ b/qrexec/qrexec-daemon.c
@@ -147,6 +147,8 @@ void init(int xid)
 	case 0:
 		break;
 	default:
+		if (getenv("QREXEC_STARTUP_NOWAIT"))
+			exit(0);
 		fprintf(stderr, "Waiting for VM's qrexec agent.");
 		for (i=0;i<startup_timeout;i++) {
 			sleep(1);
diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec
index a1f6425..f7077fb 100644
--- a/rpm_spec/core-dom0-linux.spec
+++ b/rpm_spec/core-dom0-linux.spec
@@ -85,7 +85,7 @@ install -D appmenus-scripts/qvm-sync-appmenus $RPM_BUILD_ROOT/usr/bin/qvm-sync-a
 
 mkdir -p $RPM_BUILD_ROOT/etc/qubes-rpc/policy
 cp appmenus-scripts/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes-rpc/
-cp appmenus-scripts/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/
+cp appmenus-scripts/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.SyncAppMenus
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/qubes-appmenus/
 cp appmenus-files/* $RPM_BUILD_ROOT/usr/share/qubes-appmenus/
@@ -185,7 +185,7 @@ sed -i 's/^UseNetworkHeuristic=.*/UseNetworkHeuristic=false/' /etc/PackageKit/Pa
 mv -f /lib/udev/rules.d/69-xorg-vmmouse.rules /var/lib/qubes/removed-udev-scripts/ 2> /dev/null || :
 
 %files
-/etc/qubes-rpc/policy/qubes.SyncAppMenus.policy
+/etc/qubes-rpc/policy/qubes.SyncAppMenus
 /etc/qubes-rpc/qubes.SyncAppMenus
 %{python_sitearch}/qubes/modules/10appmenus.py
 %{python_sitearch}/qubes/modules/10appmenus.pyc