diff --git a/packages/x11/driver/xf86-input-wacom/config/10-wacom.conf b/packages/x11/driver/xf86-input-wacom/config/10-wacom.conf
new file mode 100644
index 0000000000..dd486eef48
--- /dev/null
+++ b/packages/x11/driver/xf86-input-wacom/config/10-wacom.conf
@@ -0,0 +1,20 @@
+Section "InputClass"
+        Identifier "Wacom class"
+        MatchProduct "Wacom|WALTOP|WACOM"
+        Driver "wacom"
+EndSection
+
+Section "InputClass"
+        Identifier "Wacom serial class"
+        MatchProduct "WACf|FUJ02e5|FUJ02e7"
+        Driver "wacom"
+        Option "ForceDevice" "ISDV4"
+EndSection
+
+# N-Trig Duosense Electromagnetic Digitizer
+Section "InputClass"
+        Identifier "Wacom N-Trig class"
+        MatchProduct "HID 1b96:0001"
+        MatchDevicePath "/dev/input/event*"
+        Driver "wacom"
+EndSection
diff --git a/packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules b/packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules
new file mode 100644
index 0000000000..b7da7c1b1f
--- /dev/null
+++ b/packages/x11/driver/xf86-input-wacom/config/69-xorg-wacom.rules
@@ -0,0 +1,2 @@
+ACTION=="add|change", SUBSYSTEM=="pnp", ATTR{id}=="WACf*", ENV{NAME}="Serial Wacom Tablet"
+ACTION=="add|change", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{x11_driver}="wacom", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
diff --git a/packages/x11/driver/xf86-input-wacom/install b/packages/x11/driver/xf86-input-wacom/install
index 38599edb63..47555323cb 100755
--- a/packages/x11/driver/xf86-input-wacom/install
+++ b/packages/x11/driver/xf86-input-wacom/install
@@ -2,11 +2,16 @@
 
 . config/options
 
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
 mkdir -p $INSTALL/$XORG_PATH_MODULES/input
   cp -PR $PKG_BUILD/src/.libs/wacom_drv.so $INSTALL/$XORG_PATH_MODULES/input
 
-mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
-  cp -PR $PKG_BUILD/fdi/*.fdi $INSTALL/usr/share/hal/fdi/policy/20thirdparty/
+mkdir -p $INSTALL/etc/X11/xorg.conf.d
+  cp -PR $PKG_DIR/config/*.conf $INSTALL/etc/X11/xorg.conf.d
+
+mkdir -p $INSTALL/lib/udev/rules.d
+  cp -PR $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
 
 mkdir -p $INSTALL/usr/bin
   cp -PR $PKG_BUILD/tools/xsetwacom $INSTALL/usr/bin