--- arch/i386/kernel/apm.c	2004-10-19 07:53:08.000000000 +1000
+++ arch/i386/kernel/apm.c	2004-10-27 23:19:57.494535285 +1000
@@ -1803,6 +1803,7 @@
 	/* Install our power off handler.. */
 	if (power_off)
 		pm_power_off = apm_power_off;
+	pm_power_off();
 
 	if (num_online_cpus() == 1 || smp) {
 #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT)
--- drivers/acpi/sleep/poweroff.c	2004-10-19 07:55:28.000000000 +1000
+++ drivers/acpi/sleep/poweroff.c	2004-10-27 23:20:38.995228815 +1000
@@ -30,6 +30,7 @@
 		status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
 		if (ACPI_SUCCESS(status))
 			pm_power_off = acpi_power_off;
+		pm_power_off();
 	}
 	return 0;
 }