diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index febf5f44b37..44d186dd54e 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -138,7 +138,14 @@ in
           ''
             pid=$(cat ${homeDir}/pid)
             if test -n "$pid"; then
-                kill -9 $pid
+                kill $pid
+            fi
+
+            # !!! Hack: doesn't belong here.
+            pid=$(cat /var/run/ConsoleKit/pid)
+            if test -n "$pid"; then
+                kill $pid
+                rm /var/run/ConsoleKit/pid
             fi
           '';
       };