diff --git a/Makefile b/Makefile
index 1e04284..b656d9a 100644
--- a/Makefile
+++ b/Makefile
@@ -274,6 +274,9 @@ install-common: install-doc
 
 	install -d $(DESTDIR)/etc/qubes/rpc-config
 	install -m 0644 qubes-rpc/rpc-config.README $(DESTDIR)/etc/qubes/rpc-config/README
+	for config in qubes-rpc/*.config; do \
+		install -m 0644 $$config $(DESTDIR)/etc/qubes/rpc-config/`basename $$config .config`; \
+	done
 
 	install -d $(DESTDIR)/etc/qubes/suspend-pre.d
 	install -m 0644 qubes-rpc/suspend-pre.README $(DESTDIR)/etc/qubes/suspend-pre.d/README
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index ddf92e2..fade43a 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -33,6 +33,12 @@ etc/qubes-suspend-module-blacklist
 etc/qubes/autostart/*
 etc/qubes/post-install.d/README
 etc/qubes/post-install.d/*.sh
+etc/qubes/rpc-config/qubes.OpenInVM
+etc/qubes/rpc-config/qubes.OpenURL
+etc/qubes/rpc-config/qubes.SelectFile
+etc/qubes/rpc-config/qubes.SelectDirectory
+etc/qubes/rpc-config/qubes.StartApp
+etc/qubes/rpc-config/qubes.InstallUpdatesGUI
 etc/qubes/suspend-post.d/README
 etc/qubes/suspend-post.d/*.sh
 etc/qubes/suspend-pre.d/README
diff --git a/qubes-rpc/qubes.InstallUpdatesGUI.config b/qubes-rpc/qubes.InstallUpdatesGUI.config
new file mode 100644
index 0000000..094e56c
--- /dev/null
+++ b/qubes-rpc/qubes.InstallUpdatesGUI.config
@@ -0,0 +1 @@
+wait-for-session=1
diff --git a/qubes-rpc/qubes.OpenInVM.config b/qubes-rpc/qubes.OpenInVM.config
new file mode 100644
index 0000000..094e56c
--- /dev/null
+++ b/qubes-rpc/qubes.OpenInVM.config
@@ -0,0 +1 @@
+wait-for-session=1
diff --git a/qubes-rpc/qubes.OpenURL.config b/qubes-rpc/qubes.OpenURL.config
new file mode 100644
index 0000000..094e56c
--- /dev/null
+++ b/qubes-rpc/qubes.OpenURL.config
@@ -0,0 +1 @@
+wait-for-session=1
diff --git a/qubes-rpc/qubes.SelectDirectory.config b/qubes-rpc/qubes.SelectDirectory.config
new file mode 100644
index 0000000..094e56c
--- /dev/null
+++ b/qubes-rpc/qubes.SelectDirectory.config
@@ -0,0 +1 @@
+wait-for-session=1
diff --git a/qubes-rpc/qubes.SelectFile.config b/qubes-rpc/qubes.SelectFile.config
new file mode 100644
index 0000000..094e56c
--- /dev/null
+++ b/qubes-rpc/qubes.SelectFile.config
@@ -0,0 +1 @@
+wait-for-session=1
diff --git a/qubes-rpc/qubes.StartApp.config b/qubes-rpc/qubes.StartApp.config
new file mode 100644
index 0000000..094e56c
--- /dev/null
+++ b/qubes-rpc/qubes.StartApp.config
@@ -0,0 +1 @@
+wait-for-session=1
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index a798800..b16c956 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -520,6 +520,12 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/qubes-rpc/qubes.GetDate
 %dir /etc/qubes/rpc-config
 /etc/qubes/rpc-config/README
+%config(noreplace) /etc/qubes/rpc-config/qubes.OpenInVM
+%config(noreplace) /etc/qubes/rpc-config/qubes.OpenURL
+%config(noreplace) /etc/qubes/rpc-config/qubes.SelectFile
+%config(noreplace) /etc/qubes/rpc-config/qubes.SelectDirectory
+%config(noreplace) /etc/qubes/rpc-config/qubes.StartApp
+%config(noreplace) /etc/qubes/rpc-config/qubes.InstallUpdatesGUI
 %dir /etc/qubes/autostart
 %config(noreplace) /etc/default/grub.qubes
 /etc/qubes/autostart/README.txt