diff -ruN linux-2.4.25.orig/Documentation/Configure.help linux-2.4.25/Documentation/Configure.help
--- linux-2.4.25.orig/Documentation/Configure.help	2004-02-18 14:36:30.000000000 +0100
+++ linux-2.4.25/Documentation/Configure.help	2004-03-01 23:14:24.000000000 +0100
@@ -20016,6 +20016,12 @@
   If you have a legacy free Toshiba laptop (such as the Libretto L1
   series), say Y.
 
+ACPI Dont disable GPE events
+CONFIG_ACPI_NO_GPE_DISABLE
+  Normally we disable all GPE events when we enter a system sleep state.
+  If you experience, that your Keyboard-Power-ON or other Wakeup
+  methods don't work anymore, try setting this to Y. Otherwise, say N.
+  
 Advanced Power Management BIOS support
 CONFIG_APM
   APM is a BIOS specification for saving power using several different
diff -ruN linux-2.4.25.orig/drivers/acpi/Config.in linux-2.4.25/drivers/acpi/Config.in
--- linux-2.4.25.orig/drivers/acpi/Config.in	2004-02-18 14:36:31.000000000 +0100
+++ linux-2.4.25/drivers/acpi/Config.in	2004-03-01 23:15:52.000000000 +0100
@@ -32,6 +32,7 @@
     tristate     '  Toshiba Laptop Extras'	CONFIG_ACPI_TOSHIBA
     bool         '  Debug Statements'	CONFIG_ACPI_DEBUG
     bool         '  Relaxed AML Checking'	CONFIG_ACPI_RELAXED_AML
+    bool         '  Dont disable GPE events'	CONFIG_ACPI_NO_GPE_DISABLE
   else
     if [ "$CONFIG_SMP" = "y" ]; then
       define_bool CONFIG_ACPI_BOOT		y
diff -ruN linux-2.4.25.orig/drivers/acpi/hardware/hwsleep.c linux-2.4.25/drivers/acpi/hardware/hwsleep.c
--- linux-2.4.25.orig/drivers/acpi/hardware/hwsleep.c	2004-02-18 14:36:31.000000000 +0100
+++ linux-2.4.25/drivers/acpi/hardware/hwsleep.c	2004-03-01 23:20:26.000000000 +0100
@@ -251,10 +251,12 @@
 		}
 	}
 
+#ifndef CONFIG_ACPI_NO_GPE_DISABLE
 	status = acpi_hw_disable_non_wakeup_gpes ();
 	if (ACPI_FAILURE (status)) {
 		return_ACPI_STATUS (status);
 	}
+#endif /* CONFIG_ACPI_NO_GPE_DISABLE */
 
 	/* Get current value of PM1A control */
 
@@ -380,10 +382,12 @@
 		return_ACPI_STATUS (status);
 	}
 
+#ifndef CONFIG_ACPI_NO_GPE_DISABLE
 	status = acpi_hw_disable_non_wakeup_gpes ();
 	if (ACPI_FAILURE (status)) {
 		return_ACPI_STATUS (status);
 	}
+#endif /* CONFIG_ACPI_NO_GPE_DISABLE */
 
 	ACPI_FLUSH_CPU_CACHE ();