diff --git a/00-evdev.conf b/00-evdev.conf
index b818a7b..877aa4a 100644
--- a/00-evdev.conf
+++ b/00-evdev.conf
@@ -1,6 +1,39 @@
-# Catchall class for input devices
+# 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 catchall"
+        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/xorg-x11-server.spec b/xorg-x11-server.spec
index a2c1e96..b91abc7 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.99.901
-Release:   4.%{gitdate}%{dist}
+Release:   6.%{gitdate}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -517,6 +517,14 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Feb 19 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.901-6.20100215
+- Only match device paths of /dev/input/event* for the evdev classes.
+  Reduces the number of error messages seen in the log when evdev can't
+  ioctl /dev/input/mouse devices.
+
+* Fri Feb 19 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.901-5.2010208
+- Change 00-evdev.conf to match all devices but joysticks (#566418)
+
 * Wed Feb 17 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.901-4.2010208
 - One day I'll remember to cvs add everything.
   xserver-1.8-udev-warning.patch added.