Index: acpi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi.c,v
retrieving revision 1.243
diff -u -r1.243 acpi.c
--- acpi.c	9 Oct 2007 07:48:07 -0000	1.243
+++ acpi.c	28 Jan 2008 01:52:19 -0000
@@ -2195,6 +2195,16 @@
 	}
     }
 
+    /* If devd(8) is not running, immediately enter the sleep state. */
+    if (devctl_process_running() == FALSE) {
+	ACPI_UNLOCK(acpi);
+	if (ACPI_SUCCESS(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) {
+	    return (0);
+	} else {
+	    return (ENXIO);
+	}
+    }
+
     /* Now notify devd(8) also. */
     acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state);
 
Index: acpi_dock.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi_dock.c,v
retrieving revision 1.6
diff -u -r1.6 acpi_dock.c
--- acpi_dock.c	31 May 2007 08:49:51 -0000	1.6
+++ acpi_dock.c	1 Feb 2008 18:15:38 -0000
@@ -271,8 +271,10 @@
 			return;
 		}
 
-		if (!cold)
+		if (!cold) {
 			acpi_dock_insert_children(dev);
+			acpi_UserNotify("DOCK", h, 1);
+		}
 		sc->status = ACPI_DOCK_STATUS_DOCKED;
 	}
 }
@@ -343,6 +345,7 @@
 			return;
 		}
 
+		acpi_UserNotify("DOCK", acpi_get_handle(dev), 0);
 		sc->status = ACPI_DOCK_STATUS_UNDOCKED;
 	}