diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 1f4a2759..f4d40b2e 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -688,6 +688,10 @@ void KSMServer::cleanUp()
     if (clean) return;
     clean = true;
 
+    if (klauncherSignals) {
+        klauncherSignals->call("cleanup");
+    }
+
     if (wmProcess && wmProcess->state() != QProcess::NotRunning) {
         wmProcess->kill();
         wmProcess->waitForFinished();
diff --git a/startkde.cmake b/startkde.cmake
index 9661f922..b6f69123 100644
--- a/startkde.cmake
+++ b/startkde.cmake
@@ -163,9 +163,6 @@ fi
 
 echo 'startkde: Shutting down...'  1>&2
 
-# Clean up
-kquitapp klauncher
-
 unset KDE_FULL_SESSION
 xprop -root -remove KDE_FULL_SESSION
 unset KDE_SESSION_VERSION