diff -u hal-0.5.7/debian/changelog hal-0.5.7/debian/changelog
--- hal-0.5.7/debian/changelog
+++ hal-0.5.7/debian/changelog
@@ -1,3 +1,12 @@
+hal (0.5.7-1ubuntu9) dapper; urgency=low
+
+  * debian/patches/10_volume_and_aliased_keys.patch (addon-keyboard):
+    - Add macro, volume* and mute keys (special codes <128)
+    - Add in 'aliased-keys' mirrored onto F19..F23
+    - Add battery key at value 236, (waiting for upstream), [Malone: #22451]
+
+ -- Paul Sladen <ubuntu@paul.sladen.org>  Mon, 27 Mar 2006 16:06:51 +0100
+
 hal (0.5.7-1ubuntu8) dapper; urgency=low
 
   * debian/patches/02_ignored_volumes.patch:
only in patch2:
unchanged:
--- hal-0.5.7.orig/debian/patches/10_volume_and_aliased_keys.patch
+++ hal-0.5.7/debian/patches/10_volume_and_aliased_keys.patch
@@ -0,0 +1,55 @@
+--- hald/linux2/addons/addon-keyboard.c.orig	2006-02-22 21:10:06.000000000 +0000
++++ hald/linux2/addons/addon-keyboard.c	2006-03-27 15:38:38.000000000 +0100
+@@ -6,6 +6,7 @@
+  * Copyright (C) 2005 David Zeuthen, <david@fubar.dk>
+  * Copyright (C) 2005 Ryan Lortie <desrt@desrt.ca>
+  * Copyright (C) 2006 Matthew Garrett <mjg59@srcf.ucam.org>
++ * Copyright (C) 2006 Paul Sladen <ubuntu@paul.sladen.org>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -45,8 +46,18 @@
+ 
+ static char *udi;
+ 
++/* Waiting to will be assigned upstream in 'input.h' */
++#ifndef KEY_BATTERY
++#define KEY_BATTERY 236
++#endif
++
+ static char *key_name[KEY_MAX + 1] = {
+ 	[0 ... KEY_MAX] = NULL,
++	[KEY_MACRO] = "macro",
++	[KEY_MUTE] = "mute",
++	[KEY_VOLUMEDOWN] = "volumedown",
++	[KEY_VOLUMEUP] = "volumeup",
++	[KEY_POWER] = "power",
+ 	[KEY_STOP] = "stop",
+ 	[KEY_AGAIN] = "again",
+ 	[KEY_PROPS] = "props",
+@@ -106,11 +117,11 @@
+ 	[KEY_F16] = "f16",
+ 	[KEY_F17] = "f17",
+ 	[KEY_F18] = "f18",
+-	[KEY_F19] = "f19",
+-	[KEY_F20] = "f20",
+-	[KEY_F21] = "f21",
+-	[KEY_F22] = "f22",
+-	[KEY_F23] = "f23",
++	[KEY_F19] = "light",  // Unassigned, aliased key
++	[KEY_F20] = "videoout",  // Unassigned, aliased key
++	[KEY_F21] = "rotatescreen",  // Unassigned, aliased key
++	[KEY_F22] = "videomodecycle",  // Unassigned, aliased key
++	[KEY_F23] = "presentation",  // Unassigned, aliased key
+ 	[KEY_F24] = "f24",
+ 	[KEY_PLAYCD] = "playcd",
+ 	[KEY_PAUSECD] = "pausecd",
+@@ -138,7 +149,7 @@
+ 	[KEY_BRIGHTNESSDOWN] = "brightnessdown",
+ 	[KEY_BRIGHTNESSUP] = "brightnessup",
+ 	[KEY_MEDIA] = "media",
+-	[KEY_POWER] = "power"
++	[KEY_BATTERY] = "battery"
+ };
+ 
+ static void