diff --git a/modules/services/audio/alsa.nix b/modules/services/audio/alsa.nix
index 5f463f8d8cd3..78d6a0044181 100644
--- a/modules/services/audio/alsa.nix
+++ b/modules/services/audio/alsa.nix
@@ -46,7 +46,7 @@ in
       };
 
     jobs.alsa =
-      { startOn = "udev";
+      { startOn = "started udev";
 
         preStart =
           ''
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index 5a8ffbd30a18..f48cdd49c83e 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -66,7 +66,6 @@ in
       { description = "PulseAudio system-wide server";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         preStart =
           ''
diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 5d16ebe0af4c..81a2c5ea007a 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -75,8 +75,7 @@ in
     jobs.mysql =
       { description = "MySQL server";
 
-        startOn = "filesystems";
-        stopOn = "shutdown";
+        startOn = "started filesystems";
 
         preStart =
           ''
diff --git a/modules/services/databases/postgresql.nix b/modules/services/databases/postgresql.nix
index b463e39c7257..92e6083d9485 100644
--- a/modules/services/databases/postgresql.nix
+++ b/modules/services/databases/postgresql.nix
@@ -116,8 +116,7 @@ in
     jobs.postgresql =
       { description = "PostgreSQL server";
 
-        startOn = "${startDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startDependency}";
 
         preStart =
           ''
diff --git a/modules/services/hardware/acpid.nix b/modules/services/hardware/acpid.nix
index ebb2f2a6a05b..88bfc4e72584 100644
--- a/modules/services/hardware/acpid.nix
+++ b/modules/services/hardware/acpid.nix
@@ -79,8 +79,7 @@ in
     jobs.acpid =
       { description = "ACPI daemon";
 
-        startOn = "udev";
-        stopOn = "shutdown";
+        startOn = "started udev";
 
         exec = "${pkgs.acpid}/sbin/acpid --foreground --confdir ${acpiConfDir}";
       };
diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index be51968317fe..9ee16cedf874 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -70,7 +70,6 @@ in
         # !!! TODO: make sure that HAL starts after acpid,
         # otherwise hald-addon-acpi will grab /proc/acpi/event.
         startOn = if config.powerManagement.enable then "started acpid" else "started dbus";
-        stopOn = "shutdown";
 
         environment =
           { # !!! HACK? These environment variables manipulated inside
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index eebf9672a840..798b9a4e381b 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -159,7 +159,6 @@ in
 
     jobs.udev =
       { startOn = "startup";
-        stopOn = "shutdown";
 
         environment = { UDEV_CONFIG_FILE = conf; };
 
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 98d9d5eeabf9..2b8a6a64d99a 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -8,7 +8,6 @@
     { description = "Kernel log daemon";
 
       startOn = "started syslogd";
-      stopOn = "shutdown";
 
       exec =
         "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " +
diff --git a/modules/services/mail/dovecot.nix b/modules/services/mail/dovecot.nix
index 8ddbe5bfd7b5..a41bd9eaad7f 100644
--- a/modules/services/mail/dovecot.nix
+++ b/modules/services/mail/dovecot.nix
@@ -116,7 +116,7 @@ in
     jobs.dovecot =
       { description = "Dovecot IMAP/POP3 server";
 
-        startOn = "${startingDependency}/started";
+        startOn = "started ${startingDependency}";
 
         preStart =
           ''
diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index b5ed10d957b2..ae85dd43f239 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -283,7 +283,7 @@ in
       # accurate way is unlikely to be better.
       { description = "Postfix mail server";
 
-        startOn = "${startingDependency}/started";
+        startOn = "started ${startingDependency}";
 
         script =
           ''
diff --git a/modules/services/misc/autofs.nix b/modules/services/misc/autofs.nix
index b9936d0249d6..079c684d0864 100644
--- a/modules/services/misc/autofs.nix
+++ b/modules/services/misc/autofs.nix
@@ -75,8 +75,8 @@ in
     jobs.autofs =
       { description = "Filesystem automounter";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         environment =
           { PATH = "${pkgs.nfsUtils}/sbin:${config.system.sbin.modprobe}/sbin";
diff --git a/modules/services/misc/disnix.nix b/modules/services/misc/disnix.nix
index 225762813ee2..886c86e7fabd 100644
--- a/modules/services/misc/disnix.nix
+++ b/modules/services/misc/disnix.nix
@@ -39,8 +39,7 @@ in
     jobs.disnix =
       { description = "Disnix server";
 
-        startOn = "dbus";
-        stopOn = "shutdown";
+        startOn = "started dbus";
 
         script =
           ''    
diff --git a/modules/services/misc/gpsd.nix b/modules/services/misc/gpsd.nix
index 98feef682315..83cc6bae1d57 100644
--- a/modules/services/misc/gpsd.nix
+++ b/modules/services/misc/gpsd.nix
@@ -88,8 +88,8 @@ in
     jobs.gpsd =
       { description = "GPSD daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec =
           ''
diff --git a/modules/services/misc/nixos-manual.nix b/modules/services/misc/nixos-manual.nix
index 04fc34c94fae..ed2972e5b5bb 100644
--- a/modules/services/misc/nixos-manual.nix
+++ b/modules/services/misc/nixos-manual.nix
@@ -78,8 +78,7 @@ in
 
           description = "NixOS manual";
 
-          startOn = "udev";
-          stopOn = "shutdown";
+          startOn = "started udev";
 
           exec =
             ''
diff --git a/modules/services/misc/rogue.nix b/modules/services/misc/rogue.nix
index 43f43ae5bad7..8760ce125102 100644
--- a/modules/services/misc/rogue.nix
+++ b/modules/services/misc/rogue.nix
@@ -43,8 +43,7 @@ in
     jobs.rogue =
       { description = "Rogue dungeon crawling game";
 
-        startOn = "udev";
-        stopOn = "shutdown";
+        startOn = "started udev";
 
         extraConfig = "chdir /root";
 
diff --git a/modules/services/misc/synergy.nix b/modules/services/misc/synergy.nix
index 72eaf640ea85..96616fa7a733 100644
--- a/modules/services/misc/synergy.nix
+++ b/modules/services/misc/synergy.nix
@@ -76,8 +76,8 @@ in
 
             description = "Synergy client";
 
-            startOn = "network-interfaces/started";
-            stopOn = "network-interfaces/stopped";
+            startOn = "started network-interfaces";
+            stopOn = "stopping network-interfaces";
 
             exec = "${pkgs.synergy}/bin/synergyc ${if cfgS.screenName == "" then "" else "-n ${cfgS.screenName}" }";
           };
@@ -89,8 +89,8 @@ in
 
             description = "Synergy server";
 
-            startOn = "network-interfaces/started";
-            stopOn = "network-interfaces/stopped";
+            startOn = "started network-interfaces";
+            stopOn = "stopping network-interfaces";
 
             exec =
               ''
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index 78e6a276fc8a..6b1b3163d26a 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -166,8 +166,8 @@ in
 
         description = "Nagios monitoring daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/monitoring/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix
index 9fbcad78c682..3691405e1e2f 100644
--- a/modules/services/monitoring/zabbix-agent.nix
+++ b/modules/services/monitoring/zabbix-agent.nix
@@ -69,8 +69,8 @@ in
 
         description = "Zabbix agent daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/monitoring/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix
index 9b006ed8ec2a..d38e955ed4f4 100644
--- a/modules/services/monitoring/zabbix-server.nix
+++ b/modules/services/monitoring/zabbix-server.nix
@@ -56,8 +56,8 @@ in
 
         description = "Zabbix server daemon";
 
-        startOn = "postgresql";
-        stopOn = "shutdown";
+        startOn = "started postgresql";
+        stopOn = "stopping postgresql";
 
         preStart =
           ''
diff --git a/modules/services/network-filesystems/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix
index 1f67d584b895..2f6904457b20 100644
--- a/modules/services/network-filesystems/nfs-kernel.nix
+++ b/modules/services/network-filesystems/nfs-kernel.nix
@@ -81,8 +81,8 @@ in
       
         description = "Kernel NFS server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
@@ -111,8 +111,8 @@ in
 
         description = "Kernel NFS server";
 
-        startOn = "nfs-kernel-exports/started";
-        stopOn = "nfs-kernel-exports/stop";
+        startOn = "started nfs-kernel-exports";
+        stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.nfsd ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} ${builtins.toString cfg.nproc}";
       };
@@ -122,8 +122,8 @@ in
 
         description = "Kernel NFS server - mount daemon";
 
-        startOn = "nfs-kernel-nfsd/started";
-        stopOn = "nfs-kernel-exports/stop";
+        startOn = "started nfs-kernel-nfsd";
+        stopOn = "stopping nfs-kernel-exports";
 
         exec = "${pkgs.nfsUtils}/sbin/rpc.mountd -F -f ${exports}";
       };
@@ -133,8 +133,8 @@ in
       
         description = "Kernel NFS server - Network Status Monitor";
       
-        startOn = "nfs-kernel-nfsd/started";
-	stopOn = "nfs-kernel-exports/stop";
+        startOn = "started nfs-kernel-nfsd";
+	stopOn = "stopping nfs-kernel-exports";
 
         preStart =
           ''	
diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix
index 98d58e9f7f4a..6e9cd391597c 100644
--- a/modules/services/network-filesystems/samba.nix
+++ b/modules/services/network-filesystems/samba.nix
@@ -56,8 +56,8 @@ let
     { name = "samba-${appName}";
       description = "Samba Service daemon ${appName}";
 
-      startOn = "samba/started";
-      stopOn = "samba-control/stop";
+      startOn = "started samba";
+      stopOn = "stopping samba-control";
 
       exec = "${samba}/sbin/${appName} ${args}";
     };
@@ -168,8 +168,8 @@ in
       { name = "samba";
         description = "Samba server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart = setupScript;
       };
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index f3033e8a4089..82693c7399e4 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -118,8 +118,8 @@ in
     jobs.avahi_daemon =
       { name = "avahi-daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         script =
           ''
diff --git a/modules/services/networking/bitlbee.nix b/modules/services/networking/bitlbee.nix
index 2aa51603d058..f61227e09848 100644
--- a/modules/services/networking/bitlbee.nix
+++ b/modules/services/networking/bitlbee.nix
@@ -67,8 +67,8 @@ in
     jobs.bitlbee =
       { description = "BitlBee IRC to other chat networks gateway";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/ddclient.nix b/modules/services/networking/ddclient.nix
index b5bffa83cd72..575386c85795 100644
--- a/modules/services/networking/ddclient.nix
+++ b/modules/services/networking/ddclient.nix
@@ -114,7 +114,6 @@ in
       { name = "ddclient";
 
         startOn = "startup";
-        stopOn = "shutdown"; 
 
         preStart =
           ''
diff --git a/modules/services/networking/dhclient.nix b/modules/services/networking/dhclient.nix
index 5a193e60728e..600b7196aa4f 100644
--- a/modules/services/networking/dhclient.nix
+++ b/modules/services/networking/dhclient.nix
@@ -62,8 +62,8 @@ in
   config = mkIf config.networking.useDHCP {
 
     jobs.dhclient = 
-      { startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/dhcpd.nix b/modules/services/networking/dhcpd.nix
index 6daa0c073b8d..43e0843cb971 100644
--- a/modules/services/networking/dhcpd.nix
+++ b/modules/services/networking/dhcpd.nix
@@ -111,8 +111,8 @@ in
     jobs.dhcpd =
       { description = "DHCP server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         script =
           ''
diff --git a/modules/services/networking/ejabberd.nix b/modules/services/networking/ejabberd.nix
index 4dce0926364c..ae8cf47b2fa1 100644
--- a/modules/services/networking/ejabberd.nix
+++ b/modules/services/networking/ejabberd.nix
@@ -54,8 +54,8 @@ in
     jobs.ejabberd =
       { description = "EJabberd server";
 
-        startOn = "network-interface/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interface";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index 0b8a8d930617..28c43ef33707 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -79,7 +79,7 @@ in
     environment.systemPackages = [pkgs.iptables];
 
     jobs.firewall =
-      { startOn = "network-interfaces/started";
+      { startOn = "started network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/gnunet.nix b/modules/services/networking/gnunet.nix
index e35dfbcd1a8e..53223f1df22c 100644
--- a/modules/services/networking/gnunet.nix
+++ b/modules/services/networking/gnunet.nix
@@ -194,8 +194,8 @@ in
     jobs.gnunetd =
       { description = "The GNUnet Daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index d723766bb2cb..eaf84c5f70f3 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -134,8 +134,8 @@ in
     jobs.gw6c =
       { description = "Gateway6 client";
       
-        startOn = if cfg.autorun then "network-interfaces/started" else "";
-        stopOn = "network-interfaces/stop";
+        startOn = if cfg.autorun then "started network-interfaces" else "";
+        stopOn = "stopping network-interfaces";
 
         exec = "${gw6cService}/bin/control start";
       };
diff --git a/modules/services/networking/ifplugd.nix b/modules/services/networking/ifplugd.nix
index 85eda29f5a27..f1510b1aa4b2 100644
--- a/modules/services/networking/ifplugd.nix
+++ b/modules/services/networking/ifplugd.nix
@@ -58,8 +58,8 @@ in
     jobs.ifplugd =
       { description = "Network interface connectivity monitor";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec =
           ''
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
index aea5fbd6550e..34c3b13d82d8 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@@ -122,8 +122,8 @@ in
 
         description = "IRCD Hybrid server";
 
-        startOn = "${startingDependency}/started";
-        stopOn = "${startingDependency}/stop";
+        startOn = "started ${startingDependency}";
+        stopOn = "stopping ${startingDependency}";
 
         exec = "${ircdService}/bin/control start";
       };
diff --git a/modules/services/networking/openfire.nix b/modules/services/networking/openfire.nix
index 67e2558b22a1..a46b4fa42947 100644
--- a/modules/services/networking/openfire.nix
+++ b/modules/services/networking/openfire.nix
@@ -52,8 +52,7 @@ in
     jobs.openfire =
       { description = "OpenFire XMPP server";
 
-        startOn = "${startDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startDependency}";
 
         script =
           ''
diff --git a/modules/services/networking/portmap.nix b/modules/services/networking/portmap.nix
index 0fcbf63d7991..5a51836efad7 100644
--- a/modules/services/networking/portmap.nix
+++ b/modules/services/networking/portmap.nix
@@ -66,8 +66,8 @@ in
     jobs.portmap =
       { description = "ONC RPC portmap";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec =
           ''
diff --git a/modules/services/networking/privoxy.nix b/modules/services/networking/privoxy.nix
index f2350f4c4622..eee020a1f0e1 100644
--- a/modules/services/networking/privoxy.nix
+++ b/modules/services/networking/privoxy.nix
@@ -81,7 +81,6 @@ in
       { name = "privoxy";
 
         startOn = "startup";
-        stopOn = "shutdown"; 
 
         preStart =
           ''
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index c3a14ba17e89..f5d52c82101d 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -119,8 +119,8 @@ in
     jobs.lshd =
       { description = "GNU lshd SSH2 daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         environment =
           { LD_LIBRARY_PATH = config.system.nssModules.path; };
diff --git a/modules/services/networking/vsftpd.nix b/modules/services/networking/vsftpd.nix
index b98a9aa3f7d3..4c6b6f411cd0 100644
--- a/modules/services/networking/vsftpd.nix
+++ b/modules/services/networking/vsftpd.nix
@@ -102,8 +102,8 @@ in
     jobs.vsftpd =
       { description = "vsftpd server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 37b5923421fd..93450f8eac17 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -38,8 +38,8 @@ in
     environment.systemPackages = [pkgs.wpa_supplicant];
 
     jobs.wpa_supplicant = 
-      { startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+      { startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/networking/xinetd.nix b/modules/services/networking/xinetd.nix
index be9e5712e7de..4729ba9d2e4f 100644
--- a/modules/services/networking/xinetd.nix
+++ b/modules/services/networking/xinetd.nix
@@ -122,8 +122,8 @@ in
     jobs.xinetd =
       { description = "xinetd server";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         exec = "${xinetd}/sbin/xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
       };
diff --git a/modules/services/printing/cupsd.nix b/modules/services/printing/cupsd.nix
index 149055d74c51..546eb7be3964 100644
--- a/modules/services/printing/cupsd.nix
+++ b/modules/services/printing/cupsd.nix
@@ -160,8 +160,8 @@ in
     jobs.cupsd =
       { description = "CUPS printing daemon";
 
-        startOn = "network-interfaces/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interfaces";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''
diff --git a/modules/services/scheduling/atd.nix b/modules/services/scheduling/atd.nix
index fb579dbf0b2a..19fda42928ab 100644
--- a/modules/services/scheduling/atd.nix
+++ b/modules/services/scheduling/atd.nix
@@ -67,7 +67,6 @@ in
       { description = "at daemon (atd)";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         preStart =
           ''
@@ -97,12 +96,12 @@ in
                 chown atd:atd "$jobdir"/.SEQ && \
                 chmod 600 "$jobdir"/.SEQ
             fi
-
-            # `atd' doesn't have a no-fork flag, so start it here. !!!
-            # Fix this once we have Upstart 0.6.
-            ${at}/sbin/atd
           '';
 
+        daemonType = "fork";
+
+        exec = "${at}/sbin/atd";
+
         postStop =
           ''
             test -e /var/run/atd.pid && kill $(cat /var/run/atd.pid)
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index 930162f1c732..bae03f40138e 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -70,7 +70,6 @@ in
       { description = "Cron daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
  
         # Needed to interpret times in the local timezone.
         environment = { TZ = config.time.timeZone; };
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index b38a70b932af..fbd1288a55f8 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -101,7 +101,6 @@ in
       { description = "fcron daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         environment =
           { PATH = "/var/run/current-system/sw/bin";
diff --git a/modules/services/system/nscd.nix b/modules/services/system/nscd.nix
index a14215c70d1b..1e3a4ff75c98 100644
--- a/modules/services/system/nscd.nix
+++ b/modules/services/system/nscd.nix
@@ -21,7 +21,6 @@ in
       { description = "Name Service Cache Daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         environment = { LD_LIBRARY_PATH = nssModulesPath; };
         
diff --git a/modules/services/system/uptimed.nix b/modules/services/system/uptimed.nix
index 3749358ac208..fd4c1652bd33 100644
--- a/modules/services/system/uptimed.nix
+++ b/modules/services/system/uptimed.nix
@@ -53,7 +53,6 @@ in
       { description = "Uptimed daemon";
 
         startOn = "startup";
-        stopOn = "shutdown";
 
         preStart =
           ''
diff --git a/modules/services/ttys/gpm.nix b/modules/services/ttys/gpm.nix
index 026ed4a299f5..256fe8d2380a 100644
--- a/modules/services/ttys/gpm.nix
+++ b/modules/services/ttys/gpm.nix
@@ -41,8 +41,7 @@ in
     jobs.gpm =
       { description = "General purpose mouse";
 
-        startOn = "udev";
-        stopOn = "shutdown";
+        startOn = "started udev";
 
         exec = "${pkgs.gpm}/sbin/gpm -m /dev/input/mice -t ${cfg.protocol} -D &>/dev/null";
       };
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 7e3067510d3f..c489393f889a 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -450,8 +450,7 @@ in
 
         description = "Apache HTTPD";
 
-        startOn = "${startingDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startingDependency}";
 
         environment =
           { # !!! This should be added in test-instrumentation.nix.  It
diff --git a/modules/services/web-servers/tomcat.nix b/modules/services/web-servers/tomcat.nix
index 331653ba9296..4eb5b3fc5b52 100644
--- a/modules/services/web-servers/tomcat.nix
+++ b/modules/services/web-servers/tomcat.nix
@@ -104,8 +104,8 @@ in
     jobs.tomcat =
       { description = "Apache Tomcat server";
 
-        startOn = "network-interface/started";
-        stopOn = "network-interfaces/stop";
+        startOn = "started network-interface";
+        stopOn = "stopping network-interfaces";
 
         preStart =
           ''        
diff --git a/modules/services/x11/xfs.nix b/modules/services/x11/xfs.nix
index 860d5823be36..f2b7108debc8 100644
--- a/modules/services/x11/xfs.nix
+++ b/modules/services/x11/xfs.nix
@@ -43,8 +43,7 @@ in
     jobs.xfs =
       { description = "X Font Server";
       
-        startOn = "${startingDependency}/started";
-        stopOn = "shutdown";
+        startOn = "started ${startingDependency}";
 
         exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
       };
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 2d432e831f7d..ff288f3b1b0b 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -360,7 +360,7 @@ in
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions;
 
     jobs.xserver =
-      { startOn = if cfg.autorun then "hal" else "never";
+      { startOn = if cfg.autorun then "started hal" else "";
  
         environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup