diff --git a/templates/hal/files/10-keymap.fdi b/templates/hal/files/10-keymap.fdi
new file mode 100644
index 00000000000..0b96d894f29
--- /dev/null
+++ b/templates/hal/files/10-keymap.fdi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.capabilities" contains="input.keys">
+      <merge key="input.xkb.rules" type="string">xorg</merge>
+      <merge key="input.xkb.layout" type="string">us</merge>
+      <merge key="input.xkb.variant" type="string" />
+    </match>
+  </device>
+</deviceinfo>
diff --git a/templates/hal/template b/templates/hal/template
index 4bd5fb6a89b..53a5c4527e3 100644
--- a/templates/hal/template
+++ b/templates/hal/template
@@ -14,7 +14,8 @@ long_desc="
  HAL is daemon for collecting and maintaining information from several
  sources about the hardware on the system."
 
-conf_files="/etc/dbus-1/system.d/hal.conf"
+conf_files="/etc/dbus-1/system.d/hal.conf
+ /etc/hal/fdi/policy/10-keymap.fdi"
 
 Add_dependency full glibc
 Add_dependency full udev
@@ -37,4 +38,6 @@ post_install()
 {
 	rm -rf ${DESTDIR}/var
 	install -D -m755 ${FILESDIR}/hal ${DESTDIR}/etc/rc.d/hal
+	install -D -m644 ${FILESDIR}/10-keymap.fdi \
+		${DESTDIR}/etc/hal/fdi/policy/10-keymap.fdi
 }