diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt
index 1a4d8046b..34f943f5d 100644
--- a/ksmserver/CMakeLists.txt
+++ b/ksmserver/CMakeLists.txt
@@ -73,3 +73,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KSMServerDBusInterfaceConfig.cmake
 install( FILES org.kde.KSMServerInterface.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
 
 ecm_install_configured_files(INPUT plasma-ksmserver.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
+ecm_install_configured_files(INPUT plasma-restoresession.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
diff --git a/ksmserver/plasma-restoresession.service.in b/ksmserver/plasma-restoresession.service.in
new file mode 100644
index 000000000..db5c01b1e
--- /dev/null
+++ b/ksmserver/plasma-restoresession.service.in
@@ -0,0 +1,9 @@
+[Unit]
+Description=KDE Session Management Server
+After=plasma-ksmserver.service plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service
+
+[Service]
+Type=oneshot
+ExecStart=-@QtBinariesDir@/qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.restoreSession
+Slice=session.slice
+RefuseManualStart=yes
diff --git a/startkde/systemd/plasma-workspace@.target b/startkde/systemd/plasma-workspace@.target
index 7bec34d7a..d6c2a7e6d 100644
--- a/startkde/systemd/plasma-workspace@.target
+++ b/startkde/systemd/plasma-workspace@.target
@@ -2,5 +2,5 @@
 Description=KDE Plasma Workspace
 Requires=plasma-core@%i.target plasma-ksplash-ready.service
 BindsTo=graphical-session.target
-Wants=xdg-desktop-autostart.target plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service
+Wants=xdg-desktop-autostart.target plasma-xembedsniproxy.service plasma-gmenudbusmenuproxy.service plasma-restoresession.service
 After=plasma-core.target