diff -Naur xf86-input-wacom-0.10.3/fdi/wacom.fdi xf86-input-wacom-0.10.3-patched/fdi/wacom.fdi
--- xf86-input-wacom-0.10.3/fdi/wacom.fdi	2009-12-22 14:36:42.000000000 +0800
+++ xf86-input-wacom-0.10.3-patched/fdi/wacom.fdi	2009-12-28 18:39:03.000000000 +0800
@@ -1,25 +1,61 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- this is probably a bit imprecise -->
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+
 <deviceinfo version="0.2">
   <device>
     <match key="info.category" contains="input">
-      <match key="info.product" contains_outof="Wacom;WALTOP;WACOM">
+      <match key="info.product" contains="Wacom">
 	<merge key="input.x11_driver" type="string">wacom</merge>
+	<merge key="input.x11_options.Type" type="string">stylus</merge>
+        <append key="info.callouts.add" type="strlist">hal-setup-wacom</append>
+        <append key="wacom.types" type="strlist">eraser</append>
+        <append key="wacom.types" type="strlist">cursor</append>
+        <append key="wacom.types" type="strlist">pad</append>
+      </match>
+      <match key="info.product" contains="WALTOP">
+	<merge key="input.x11_driver" type="string">wacom</merge>
+	<merge key="input.x11_options.Type" type="string">stylus</merge>
+        <append key="info.callouts.add" type="strlist">hal-setup-wacom</append>
+        <append key="wacom.types" type="strlist">eraser</append>
+        <append key="wacom.types" type="strlist">cursor</append>
+        <append key="wacom.types" type="strlist">pad</append>
       </match>
     </match>
     <match key="info.capabilities" contains="serial">
-      <match key="@info.parent:pnp.id" contains_outof="WACf;FUJ02e5;FUJ02e7">
-	<append key="info.capabilities" type="strlist">input</append>
-	<merge key="input.x11_driver" type="string">wacom</merge>
+      <match key="@info.parent:pnp.id" contains_outof="WACf001;WACf002;WACf003;WACf004;WACf005;WACf006;WACf007;WACf008;WACf009;WACf00a;WACf00b;WACf00c;FUJ02e5">
+        <append key="info.capabilities" type="strlist">input</append>
+        <merge key="input.x11_driver" type="string">wacom</merge>
+        <merge key="input.x11_options.Type" type="string">stylus</merge>
 	<merge key="input.x11_options.ForceDevice" type="string">ISDV4</merge>
-	<merge key="input.device" type="copy_property">serial.device</merge>
+        <merge key="input.device" type="copy_property">serial.device</merge>
+        <append key="info.callouts.add" type="strlist">hal-setup-wacom</append>
+        <append key="wacom.types" type="strlist">eraser</append>
+        <match key="@info.parent:pnp.id" contains_outof="WACf008;WACf009">
+          <!-- Serial tablets with touch capabilities -->
+          <append key="wacom.types" type="strlist">touch</append>
+        </match>
       </match>
     </match>
     <!-- N-Trig Duosense Electromagnetic Digitizer -->
     <match key="info.product" contains="HID 1b96:0001">
       <match key="info.parent" contains="if0">
        <merge key="input.x11_driver" type="string">wacom</merge>
+       <merge key="input.x11_options.Type" type="string">stylus</merge>
+      </match>
+    </match>
+  </device>
+  <!-- Match the Wacom Bluetooth A5 pen tablet -->
+  <device>
+    <match key="info.capabilities" contains="input.mouse">
+      <match key="info.product" contains="WACOM">
+        <match key="info.product" contains="Tablet">
+          <merge key="input.x11_driver" type="string">wacom</merge>
+          <merge key="input.x11_options.Type" type="string">stylus</merge>
+          <append key="info.callouts.add" type="strlist">hal-setup-wacom</append>
+          <append key="wacom.types" type="strlist">eraser</append>
+          <append key="wacom.types" type="strlist">cursor</append>
+        </match>
       </match>
     </match>
   </device>
+
 </deviceinfo>