diff -ru linux-2.6.17-a/drivers/acpi/battery.c linux-2.6.17-b/drivers/acpi/battery.c
--- linux-2.6.17-a/drivers/acpi/battery.c	2006-06-27 14:00:01.000000000 +0400
+++ linux-2.6.17-b/drivers/acpi/battery.c	2006-06-27 14:02:29.000000000 +0400
@@ -687,6 +687,8 @@
 	switch (event) {
 	case ACPI_BATTERY_NOTIFY_STATUS:
 	case ACPI_BATTERY_NOTIFY_INFO:
+	case ACPI_NOTIFY_BUS_CHECK:
+	case ACPI_NOTIFY_DEVICE_CHECK:
 		acpi_battery_check(battery);
 		acpi_bus_generate_event(device, event, battery->flags.present);
 		break;
@@ -729,7 +731,7 @@
 		goto end;
 
 	status = acpi_install_notify_handler(battery->handle,
-					     ACPI_DEVICE_NOTIFY,
+					     ACPI_ALL_NOTIFY,
 					     acpi_battery_notify, battery);
 	if (ACPI_FAILURE(status)) {
 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
@@ -764,7 +766,7 @@
 	battery = (struct acpi_battery *)acpi_driver_data(device);
 
 	status = acpi_remove_notify_handler(battery->handle,
-					    ACPI_DEVICE_NOTIFY,
+					    ACPI_ALL_NOTIFY,
 					    acpi_battery_notify);
 	if (ACPI_FAILURE(status))
 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,