diff -Nru /tmp/k5pTChcro8/hotkey-setup-0.1/compaq.hk /tmp/Xzew020d0j/hotkey-setup-0.1/compaq.hk
--- /tmp/k5pTChcro8/hotkey-setup-0.1/compaq.hk	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/Xzew020d0j/hotkey-setup-0.1/compaq.hk	2006-04-11 18:05:49.000000000 +0200
@@ -0,0 +1,5 @@
+# Compaq Armada E500
+setkeycodes	e023	$KEY_WWW	# I key (has an 'i' on it, similar font to that used for information booths etc)
+setkeycodes	e01f	$KEY_HOMEPAGE	# Home key (has a little picture of a house) 
+setkeycodes	e01a	$KEY_SEARCH	# Search key (i asume, because it has a picture of a magnifing glass) 
+setkeycodes	e01e	$KEY_MAIL	# Email (has an envolope on the button)
diff -Nru /tmp/k5pTChcro8/hotkey-setup-0.1/debian/changelog /tmp/Xzew020d0j/hotkey-setup-0.1/debian/changelog
--- /tmp/k5pTChcro8/hotkey-setup-0.1/debian/changelog	2006-03-30 17:36:51.000000000 +0200
+++ /tmp/Xzew020d0j/hotkey-setup-0.1/debian/changelog	2006-04-29 20:58:25.000000000 +0200
@@ -1,3 +1,10 @@
+hotkey-setup (0.1-17) unstable; urgency=low
+
+  * Add support for Samsung hotkeys (eg. x05 and others) [Malone: #23165]
+  * Add support for Compaq Armada E500 [Malone: #37684]
+
+ -- Paul Sladen <debian@paul.sladen.org>  Sat, 29 Apr 2006 20:32:20 +0200
+
 hotkey-setup (0.1-16) unstable; urgency=low
 
   * Add support for Lenovo ThinkPads [Malone: #37082]
diff -Nru /tmp/k5pTChcro8/hotkey-setup-0.1/debian/init.d /tmp/Xzew020d0j/hotkey-setup-0.1/debian/init.d
--- /tmp/k5pTChcro8/hotkey-setup-0.1/debian/init.d	2006-03-30 17:36:51.000000000 +0200
+++ /tmp/Xzew020d0j/hotkey-setup-0.1/debian/init.d	2006-04-29 20:37:19.000000000 +0200
@@ -47,6 +47,14 @@
 	. /usr/share/hotkey-setup/asus.hk
 	;;
 
+	Compaq*)
+	case "$name" in
+	    Armada*E500*)
+	    . /usr/share/hotkey-setup/compaq.hk
+	    ;;
+	esac
+	;;
+
 	Dell*)
 	. /usr/share/hotkey-setup/dell.hk
 	;;
@@ -85,6 +93,10 @@
 	esac
 	;;
 
+	Samsung*)
+	. /usr/share/hotkey-setup/samsung.hk
+	;;
+
 	Sony*)
 	modprobe sonypi; # Needed to get hotkey events
 	;;
diff -Nru /tmp/k5pTChcro8/hotkey-setup-0.1/samsung.hk /tmp/Xzew020d0j/hotkey-setup-0.1/samsung.hk
--- /tmp/k5pTChcro8/hotkey-setup-0.1/samsung.hk	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/Xzew020d0j/hotkey-setup-0.1/samsung.hk	2006-04-11 17:47:09.000000000 +0200
@@ -0,0 +1,5 @@
+# Samsung X05
+# (i) [x] [v/] [wifi]
+setkeycodes	75	$KEY_WWW	#
+setkeycodes	78	$KEY_MAIL	# 
+setkeycodes	74	$KEY_PROG1	# Looks like Tick