diff --git a/org.kde.KWin.Session.xml b/org.kde.KWin.Session.xml
index 4e6c96d48a..ad80f052aa 100644
--- a/org.kde.KWin.Session.xml
+++ b/org.kde.KWin.Session.xml
@@ -19,6 +19,9 @@
       <method name="finishSaveSession">
           <arg name="name" type="s" direction="in" />
       </method>
+      <!-- Shutdown kwin at the end of the session -->
+      <method name="quit">
+      </method>
    </interface>
 </node>
 
diff --git a/sm.cpp b/sm.cpp
index 51ff8aaf08..a1a36cb0c6 100644
--- a/sm.cpp
+++ b/sm.cpp
@@ -379,5 +379,10 @@ void SessionManager::finishSaveSession(const QString &name)
     emit finishSessionSaveRequested(name);
 }
 
+void SessionManager::quit()
+{
+    qApp->quit();
+}
+
 } // namespace
 
diff --git a/sm.h b/sm.h
index 6a3594b9bb..e9b6e6fab2 100644
--- a/sm.h
+++ b/sm.h
@@ -43,6 +43,7 @@ public Q_SLOTS: // DBus API
     void loadSession(const QString &name);
     void aboutToSaveSession(const QString &name);
     void finishSaveSession(const QString &name);
+    void quit();
 
 private:
     void setState(SessionState state);