diff --git a/fdi/information/10freedesktop/30-keymap-fujitsu.fdi b/fdi/information/10freedesktop/30-keymap-fujitsu.fdi
new file mode 100644
index 0000000..594359e
--- /dev/null
+++ b/fdi/information/10freedesktop/30-keymap-fujitsu.fdi
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+
+<deviceinfo version="0.2">
+  <device>
+
+    <!-- These are raw scancodes produced by the atkbd driver -->
+    <match key="@input.originating_device:info.linux.driver" string="atkbd">
+
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="FUJITSU">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pro V3205">
+          <append key="input.keymap.data" type="strlist">e074:f21</append> <!-- FIXME: silent-mode decrease CPU/GPU clock -->
+          <append key="input.keymap.data" type="strlist">e077:switchvideomode</append> <!-- Fn+F3 switch screen -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
+
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="FUJITSU">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pro Edition V3505">
+          <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn-F1 help -->
+          <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn-F3 Display toggle -->
+          <append key="input.keymap.data" type="strlist">e059:brightnessdown</append> <!--  Fn-F8 brigtness-down -->
+          <append key="input.keymap.data" type="strlist">e060:brightnessup</append> <!--  Fn-F9 brigtness-up -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+      </match>
+
+    </match>
+
+  </device>
+</deviceinfo>
+
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 1279456..4b1c4ca 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -15,14 +15,6 @@
         </match>
       </match>
 
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="FUJITSU">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="AMILO Pro V3205">
-	  <append key="input.keymap.data" type="strlist">e074:f21</append> <!-- FIXME: silent-mode decrease CPU/GPU clock -->
-          <append key="input.keymap.data" type="strlist">e077:switchvideomode</append> <!-- Fn+F3 switch screen -->
-          <append key="info.capabilities" type="strlist">input.keymap</append>
-        </match>
-      </match>
-
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="MEDION">
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="FID2060">
           <append key="input.keymap.data" type="strlist">6b:channeldown</append> <!-- Thottle Down -->
@@ -50,7 +42,7 @@
       </match>
 
       <match key="/org/freedesktop/Hal/devices/computer:system.chassis.manufacturer" prefix="MICRO-STAR">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string_outof="0031;0131">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="0131">
           <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9   Sound On/Off -->
           <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-F7   Volume down -->
           <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-F8   Volume up -->
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 98783e2..59609ab 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -73,7 +73,8 @@ dist_fdi_DATA +=					\
 		30-keymap-lenovo.fdi			\
 		30-keymap-dell.fdi			\
 		30-keymap-acer.fdi 			\
-		30-keymap-module-asus-laptop.fdi
+		30-keymap-module-asus-laptop.fdi	\
+		30-keymap-fujitsu.fdi
 endif
 
 check: