diff --git a/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf b/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf
new file mode 100644
index 0000000000..877aa4ac5e
--- /dev/null
+++ b/packages/x11/driver/xf86-input-evdev/config/00-evdev.conf
@@ -0,0 +1,39 @@
+# Catchall classes for input devices
+# We don't simply match on any device since that also adds accelerometers
+# and other devices that we don't really want to use. The list below
+# matches everything but joysticks.
+
+Section "InputClass"
+        Identifier "evdev pointer catchall"
+        MatchIsPointer "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev keyboard catchall"
+        MatchIsKeyboard "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev tablet catchall"
+        MatchIsTablet "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
+
+Section "InputClass"
+        Identifier "evdev touchscreen catchall"
+        MatchIsTouchscreen "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "evdev"
+EndSection
diff --git a/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi b/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi
deleted file mode 100644
index a7fe8ccb42..0000000000
--- a/packages/x11/driver/xf86-input-evdev/config/10-x11-evdev.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.capabilities" contains="input.mouse">
-      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-             string="Linux">
-        <merge key="input.x11_driver" type="string">evdev</merge>
-      </match>
-    </match>
-
-    <match key="info.capabilities" contains="input.keys">
-      <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-             string="Linux">
-        <merge key="input.x11_driver" type="string">evdev</merge>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/packages/x11/driver/xf86-input-evdev/install b/packages/x11/driver/xf86-input-evdev/install
index 6458108fee..f1717ff219 100755
--- a/packages/x11/driver/xf86-input-evdev/install
+++ b/packages/x11/driver/xf86-input-evdev/install
@@ -5,8 +5,7 @@
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 mkdir -p $INSTALL/$XORG_PATH_MODULES/input
-cp $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input
+  cp -PR $PKG_BUILD/src/.libs/evdev_drv.so $INSTALL/$XORG_PATH_MODULES/input
 
-mkdir -p $INSTALL/usr/share/hal/fdi/policy/20thirdparty
-cp $PKG_DIR/config/10-x11-evdev.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