diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index 352c042..71ed3bc 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -42,6 +42,7 @@ 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/rpc-config/qubes.VMShell+WaitForSession
 etc/qubes/suspend-post.d/README
 etc/qubes/suspend-post.d/*.sh
 etc/qubes/suspend-pre.d/README
diff --git a/qubes-rpc/qubes.VMShell+WaitForSession.config b/qubes-rpc/qubes.VMShell+WaitForSession.config
new file mode 100644
index 0000000..094e56c
--- /dev/null
+++ b/qubes-rpc/qubes.VMShell+WaitForSession.config
@@ -0,0 +1 @@
+wait-for-session=1
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index 763d020..cd24342 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -591,6 +591,7 @@ rm -f %{name}-%{version}
 %config(noreplace) /etc/qubes/rpc-config/qubes.SelectDirectory
 %config(noreplace) /etc/qubes/rpc-config/qubes.StartApp
 %config(noreplace) /etc/qubes/rpc-config/qubes.InstallUpdatesGUI
+%config(noreplace) /etc/qubes/rpc-config/qubes.VMShell+WaitForSession
 %dir /etc/qubes/autostart
 %config(noreplace) /etc/default/grub.qubes
 /etc/qubes/autostart/README.txt