diff -urNp hal-0.5.8.1-orig/configure.in hal-0.5.8.1-new/configure.in
--- hal-0.5.8.1-orig/configure.in	2008-07-31 16:37:16.000000000 +0100
+++ hal-0.5.8.1-new/configure.in	2008-07-31 15:30:48.000000000 +0100
@@ -297,6 +297,39 @@ AC_SUBST(HALD_BACKEND)
 dnl DBUS API is subject to changes
 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, ,DBUS API is subject to change)
 
+AC_PATH_PROG(GPERF, [gperf], [no])
+AC_MSG_CHECKING([whether to rebuild gperf header files])
+if test x$GPERF = xno ; then
+    have_gperf=no
+else
+    have_gperf=yes
+fi
+AC_SUBST(HAVE_GPERF)
+AM_CONDITIONAL(HAVE_GPERF, [test x$have_gperf = xyes])
+
+AC_ARG_WITH([keymaps], AS_HELP_STRING([--with-keymaps], [Re-map multimedia keys (auto)]))
+BUILD_KEYMAPS=no
+if test "x$with_keymaps" = "xyes"; then
+   if test "x$have_gperf" = "xyes"; then
+      BUILD_KEYMAPS=yes
+   else
+      BUILD_KEYMAPS=no
+   fi
+elif test "x$with_keymaps" = "x" ; then
+  case "${HALD_BACKEND}" in
+    linux)
+      if test "x$have_gperf" = "xyes"; then
+        BUILD_KEYMAPS=yes
+      else
+        BUILD_KEYMAPS=no
+      fi
+      ;;
+    *)
+      ;;
+  esac
+fi
+AM_CONDITIONAL(BUILD_KEYMAPS, [test x$BUILD_KEYMAPS = xyes])
+
 # check for PolicyKit
 AM_CONDITIONAL(HAVE_POLKIT, false)
 AC_ARG_ENABLE(policy-kit, [  --disable-policy-kit    Build without PolicyKit (strongly discouraged)])
@@ -564,6 +597,8 @@ echo "
         use libusb:                 ${USE_LIBUSB}
         use libpci:                 ${USE_LIBPCI}
         use libparted:              ${USE_PARTED}
+        use gperf:                  ${have_gperf}
+        use keymaps:                ${BUILD_KEYMAPS}
 
         use PolicyKit:              ${msg_polkit}
 
diff -urNp hal-0.5.8.1-orig/tools/hal-setup-keymap.c hal-0.5.8.1-new/tools/hal-setup-keymap.c
--- hal-0.5.8.1-orig/tools/hal-setup-keymap.c	1970-01-01 01:00:00.000000000 +0100
+++ hal-0.5.8.1-new/tools/hal-setup-keymap.c	2007-12-03 07:48:21.000000000 +0000
@@ -0,0 +1,167 @@
+/*
+ * Licensed under the GNU General Public License Version 2
+ *
+ * Copyright (C) 2007 Richard Hughes <richard@hughsie.com>
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#ifdef HAL_LINUX_INPUT_HEADER_H
+  #include HAL_LINUX_INPUT_HEADER_H
+#else
+  #include <linux/input.h>
+#endif
+
+#include "libhal/libhal.h"
+#include "hal-setup-keymap-hash-name.h"
+
+static LibHalContext *ctx = NULL;
+static char* udi;
+
+static int
+evdev_open (const char *dev)
+{
+	int fd;
+
+	/* requires root privs */
+	fd = open (dev, O_RDWR);
+	if (fd < 0) {
+		fprintf (stderr, "hal-setup-keymap: failed to open('%s'): %s\n",
+			 dev, strerror (errno));
+		return -1;
+	}
+
+	return fd;
+}
+
+static int
+evdev_set_keycode (int fd, int scancode, int keycode)
+{
+	int ret;
+	int codes[2];
+
+	codes[0] = scancode;
+	codes[1] = keycode;
+
+	ret = ioctl (fd, EVIOCSKEYCODE, codes);
+	if (ret < 0) {
+		fprintf (stderr, "hal-setup-keymap: failed to set scancode %x to keycode %d: %s\n",
+			 scancode, keycode, strerror(errno));
+		return -1;
+	}
+
+	return 0;
+}
+
+int
+main (int argc, char **argv)
+{
+	char **keymap_list;
+	int i = 0;
+	int fd;
+	unsigned int scancode = 0;
+	int keycode = 0;
+	char keyname[128];
+	int values;
+	char *device;
+	DBusError error;
+	const struct key *name;
+
+	udi = getenv ("UDI");
+	if (udi == NULL) {
+		fprintf (stderr, "hal-setup-keymap: Failed to get UDI\n");
+		return 1;
+	}
+	dbus_error_init (&error);
+	if ((ctx = libhal_ctx_init_direct (&error)) == NULL) {
+		fprintf (stderr, "hal-setup-keymap: Unable to initialise libhal context: %s\n", error.message);
+		return 1;
+	}
+
+	dbus_error_init (&error);
+	if (!libhal_device_addon_is_ready (ctx, udi, &error)) {
+		return 1;
+	}
+
+	/* get the string list data */
+	dbus_error_init (&error);
+	keymap_list = libhal_device_get_property_strlist (ctx, udi, "input.keymap.data", &error);
+	if (dbus_error_is_set (&error) == TRUE) {
+		fprintf (stderr, "hal-setup-keymap: Failed to get keymap list: '%s'\n", error.message);
+		return 1;
+	}
+
+	/* get the device */
+	device = libhal_device_get_property_string (ctx, udi, "input.device", &error);
+	if (dbus_error_is_set (&error) == TRUE) {
+		fprintf (stderr, "hal-setup-keymap: Failed to get input device list: '%s'\n", error.message);
+		return 1;
+	}
+
+	/* get a file descriptor to the device */
+	fprintf (stderr, "hal-setup-keymap: Using device %s\n", device);
+	fd = evdev_open (device);
+	if (fd < 0) {
+		fprintf (stderr, "hal-setup-keymap: Could not open device\n");
+		return 1;
+	}
+
+	/* add each of the keys */
+	do {
+		values = sscanf (keymap_list[i], "%x:%s", &scancode, keyname);
+		if (values == 2) {
+			/* fix for high scancodes on i8042 KBD - we do this here
+			 * and not in the fdi as the high value is displayed in
+			 * dmesg and we don't want the user to do more work */
+			if (scancode > 127) {
+				scancode -= 0xe000;
+				scancode += 128;
+			}
+
+			/* use gperf to convert as it's really quick */
+			name = lookup_key (keyname, strlen(keyname));
+			if (name != NULL) {
+				keycode = name->id;
+				fprintf (stderr, "hal-setup-keymap: parsed %s to (0x%x, %i)\n",
+					 keymap_list[i], scancode, keycode);
+				evdev_set_keycode (fd, scancode, keycode);
+			} else {
+				fprintf (stderr, "hal-setup-keymap: failed to find key '%s'\n", keyname);
+			}
+		} else {
+			fprintf (stderr, "hal-setup-keymap: Failed to parse %s\n", keymap_list[i]);
+		}
+	} while (keymap_list[++i] != NULL);
+
+	libhal_free_string_array (keymap_list);
+	close (fd);
+
+	/* we do not have to poll anything, so exit */
+	return 0;
+}
+
diff -urNp hal-0.5.8.1-orig/tools/Makefile.am hal-0.5.8.1-new/tools/Makefile.am
--- hal-0.5.8.1-orig/tools/Makefile.am	2008-07-31 16:37:16.000000000 +0100
+++ hal-0.5.8.1-new/tools/Makefile.am	2008-07-31 15:35:46.000000000 +0100
@@ -31,6 +31,13 @@ bin_PROGRAMS =                    \
 	hal-find-by-property      \
 	hal-device
 
+BUILT_SOURCES = 
+CLEANFILES = 
+
+if BUILD_KEYMAPS
+bin_PROGRAMS += hal-setup-keymap
+endif
+
 lshal_SOURCES = lshal.c
 lshal_LDADD = @GLIB_LIBS@ $(top_builddir)/libhal/libhal.la
 
@@ -49,6 +56,26 @@ hal_find_by_property_LDADD = @DBUS_LIBS@
 hal_device_SOURCES = hal-device.c
 hal_device_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
 
+
+if BUILD_KEYMAPS
+
+if HAVE_GPERF
+hal-setup-keymap-keys.txt: /usr/include/linux/input.h
+	awk '/^#define.*KEY_/ { if ($$2 != "KEY_MAX") { print substr($$2, 5) } }' < $< > $@
+
+hal-setup-keymap-hash-name.gperf: hal-setup-keymap-keys.txt
+	awk 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", KEY_" $$1 }' < $< > $@
+
+hal-setup-keymap-hash-name.h: hal-setup-keymap-hash-name.gperf
+	gperf -t --ignore-case -N lookup_key -H hash_input_names -p -C < $< > $@
+endif #HAVE_GPERF
+
+hal_setup_keymap_SOURCES = hal-setup-keymap.c
+nodist_hal_setup_keymap_SOURCES = hal-setup-keymap-hash-name.h
+hal_setup_keymap_LDADD = $(top_builddir)/libhal/libhal.la
+
+endif #BUILD_KEYMAPS
+
 libexec_PROGRAMS =                          \
 	hal-storage-mount	            \
 	hal-storage-unmount 	            \
@@ -97,6 +124,23 @@ script_SCRIPTS =				\
 
 EXTRA_DIST=$(man_MANS) $(MAN_IN_FILES) gen-libgphoto-hal-fdi $(script_SCRIPTS)
 
+if BUILD_KEYMAPS
+
+if HAVE_GPERF
+CLEANFILES += 				\
+	hal-setup-keymap-hash-name.h		\
+	hal-setup-keymap-hash-name.gperf	\
+	hal-setup-keymap-keys.txt
+
+
+BUILT_SOURCES += 				\
+	hal-setup-keymap-hash-name.h		\
+	hal-setup-keymap-hash-name.gperf	\
+	hal-setup-keymap-keys.txt
+endif
+
+endif
+
 check:
 	for f in $(script_SCRIPTS); do \
             echo -n "Validate bash syntax in $$f : "; \