diff -Nru /tmp/wcHCz14wxn/hotkey-setup-0.1/debian/changelog /tmp/IaLNruBMND/hotkey-setup-0.1/debian/changelog
--- /tmp/wcHCz14wxn/hotkey-setup-0.1/debian/changelog	2006-03-25 20:20:20.000000000 +0000
+++ /tmp/IaLNruBMND/hotkey-setup-0.1/debian/changelog	2006-03-29 18:47:00.000000000 +0100
@@ -1,3 +1,9 @@
+hotkey-setup (0.1-16) unstable; urgency=low
+
+  * Add support for Lenovo ThinkPads [Malone: #37082]
+
+ -- Paul Sladen <debian@paul.sladen.org>  Wed, 29 Mar 2006 18:21:03 +0100
+
 hotkey-setup (0.1-15) unstable; urgency=low
 
   * Changes from Paul Sladen:
diff -Nru /tmp/wcHCz14wxn/hotkey-setup-0.1/debian/init.d /tmp/IaLNruBMND/hotkey-setup-0.1/debian/init.d
--- /tmp/wcHCz14wxn/hotkey-setup-0.1/debian/init.d	2006-03-25 20:09:22.000000000 +0000
+++ /tmp/IaLNruBMND/hotkey-setup-0.1/debian/init.d	2006-03-29 18:19:33.000000000 +0100
@@ -7,6 +7,21 @@
 SAVED_STATE=/var/run/hotkey-setup
 THINKPAD_LOCKFILE=$SAVED_STATE.thinkpad-keys
 
+# This is here because it needs to be executed both if we have a
+# Lenovo that also IDs as a ThinkPad, or if we have a real IBM one.
+do_thinkpad () {
+    . /usr/share/hotkey-setup/ibm.hk
+    if [ -x /usr/sbin/thinkpad-keys ]; then
+	if [ ! -c /dev/input/uinput ]; then
+	    modprobe uinput
+	fi
+	if [ ! -b /dev/nvram ]; then
+	    modprobe nvram
+	fi
+	/usr/sbin/thinkpad-keys && touch $THINKPAD_LOCKFILE
+    fi
+}
+
 case "$1" in
     start)
 
@@ -51,18 +66,17 @@
 	;;
 
 	IBM*)
-	. /usr/share/hotkey-setup/ibm.hk
-	if [ -x /usr/sbin/thinkpad-keys ]; then
-	    if [ ! -c /dev/input/uinput ]; then
-		modprobe uinput
-	    fi
-	    if [ ! -b /dev/nvram ]; then
-		modprobe nvram
-	    fi
-	    /usr/sbin/thinkpad-keys && touch $THINKPAD_LOCKFILE
-	fi
+	do_thinkpad
 	;;
 
+	LENOVO*)
+	case "$version" in
+	    *ThinkPad*)
+	    do_thinkpad
+	    ;;
+	esac
+	;;
+	
 	MEDION*)
 	case "$name" in
 	    *FID2060*)