diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 9ee16cedf874..6c0332566335 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -67,9 +67,7 @@ in
     jobs.hal =
       { description = "HAL daemon";
         
-        # !!! 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";
+        startOn = "started dbus" + optionalString config.powerManagement.enable " and started acpid";
 
         environment =
           { # !!! HACK? These environment variables manipulated inside
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 6f79865645db..b0c8dc66ae50 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -130,12 +130,6 @@ in
 
         exec = "${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf";
 
-        postStart =
-          ''
-            # Signal Upstart that it can connect to the system bus.
-            kill -HUP 1 || true
-          '';
-
         postStop =
           ''
             # !!! Hack: doesn't belong here.