diff --git a/acpid.changes b/acpid.changes
index 8dc1418..29fdd82 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 11 11:59:56 CEST 2007 - thoenig@suse.de
+
+- Fix hotkey mask for thinkpad_acpi.modprobe (#308191) 
+
 -------------------------------------------------------------------
 Wed Aug  8 11:04:56 CEST 2007 - thoenig@suse.de
 
diff --git a/acpid.spec b/acpid.spec
index 81a4f35..7e601d1 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -13,7 +13,7 @@
 Name:           acpid
 URL:            http://acpid.sourceforge.net/
 Version:        1.0.6
-Release:        12
+Release:        19
 %define       acpi_version 0.09
 License:        GPL v2 or later
 Group:          System/Daemons
@@ -113,6 +113,8 @@ rm -rf %{buildroot}
 %ghost %config(noreplace,missingok) %_var/log/acpid
 
 %changelog
+* Tue Sep 11 2007 - thoenig@suse.de
+- Fix hotkey mask for thinkpad_acpi.modprobe (#308191)
 * Wed Aug 08 2007 - thoenig@suse.de
 - remove loading of ACPI modules, they are now being loaded
   automatically (#216564)
diff --git a/thinkpad_acpi.modprobe b/thinkpad_acpi.modprobe
index 0d4eb64..ae83675 100644
--- a/thinkpad_acpi.modprobe
+++ b/thinkpad_acpi.modprobe
@@ -9,4 +9,4 @@
 # http://bugzilla.novell.com/
 #
 
-options thinkpad_acpi hotkey=enabled,0xffff experimental=1
+options thinkpad_acpi hotkey=enabled,0xffffffff experimental=1