Index: hald/hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.63
diff -u -u -r1.63 hald_dbus.c
--- hald/hald_dbus.c	9 Jun 2006 02:19:32 -0000	1.63
+++ hald/hald_dbus.c	22 Jul 2006 16:49:50 -0000
@@ -2447,7 +2447,7 @@
 	if (!dbus_message_get_args (message, &error,
 				    DBUS_TYPE_STRING, &udi,
 				    DBUS_TYPE_INVALID)) {
-		raise_syntax (connection, message, "CommitToGdl");
+		raise_syntax (connection, message, "Remove");
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
 
Index: hald/linux2/osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.48
diff -u -u -r1.48 osspec.c
--- hald/linux2/osspec.c	21 May 2006 00:58:24 -0000	1.48
+++ hald/linux2/osspec.c	22 Jul 2006 16:49:51 -0000
@@ -486,6 +486,8 @@
 		can_hibernate = TRUE;
 	if (access ("/proc/suspend2", F_OK) == 0)
 		can_hibernate = TRUE;
+	if (access ("/sys/power/suspend2/version", F_OK) == 0)
+		can_hibernate = TRUE;
 out:
 	hal_device_property_set_bool (d, "power_management.can_suspend", can_suspend);
 	hal_device_property_set_bool (d, "power_management.can_hibernate", can_hibernate);