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/00-input-evdev.conf b/packages/x11/driver/xf86-input-evdev/config/00-input-evdev.conf
deleted file mode 100644
index b818a7b4a7..0000000000
--- a/packages/x11/driver/xf86-input-evdev/config/00-input-evdev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Catchall class for input devices
-
-Section "InputClass"
-        Identifier "evdev catchall"
-        Driver "evdev"
-EndSection