diff --git a/10-wacom.fdi b/10-wacom.fdi
new file mode 100644
index 0000000..b6fc310
--- /dev/null
+++ b/10-wacom.fdi
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- this is probably a bit imprecise -->
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.category" contains="input">
+      <match key="info.product" contains_outof="Wacom;WALTOP">
+	<merge key="input.x11_driver" type="string">wacom</merge>
+      </match>
+    </match>
+    <match key="info.capabilities" contains="serial">
+      <match key="@info.parent:pnp.id" contains_outof="WACf;FUJ02e5">
+	<append key="info.capabilities" type="strlist">input</append>
+	<merge key="input.x11_driver" type="string">wacom</merge>
+	<merge key="input.x11_options.ForceDevice" type="string">ISDV4</merge>
+	<merge key="input.device" type="copy_property">serial.device</merge>
+      </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>
+      </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>
+        </match>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 07e0537..0bef1f9 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -75,6 +75,9 @@ X.Org X11 wacom input driver development files.
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Fri Nov 20 2009 Peter Hutterer <peter.hutterer@redhat.com> 0.10.1-2
+- cvs add 10-wacom.fdi, this time really.
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer@redhat.com> 0.10.1-1
 - wacom 0.10.1
 - BuildRequires xorg-x11-util-macros 1.3.0