diff --git a/xorg-evdev-conf.diff b/xorg-evdev-conf.diff
new file mode 100644
index 0000000..c267d50
--- /dev/null
+++ b/xorg-evdev-conf.diff
@@ -0,0 +1,45 @@
+--- config/10-evdev.conf	2010/04/08 09:38:26	1.1
++++ config/10-evdev.conf	2010/04/08 09:38:31
+@@ -1,8 +1,40 @@
+ #
+ # Catch-all evdev loader for udev-based systems
+-#
++# 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.changes b/xorg-x11-server.changes
index 10c711c..7e4f36a 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr  8 11:49:46 CEST 2010 - ro@suse.de
+
+- fix evdev config file (use the one from xserver upstream)
+
 -------------------------------------------------------------------
 Tue Apr  6 20:48:21 CEST 2010 - ro@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 548770c..b811398 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -35,7 +35,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.5_%{dirsuffix}
-Release:        2
+Release:        3
 License:        GPLv2+ ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -128,6 +128,7 @@ Patch204:       missing_font_paths.diff
 Patch205:       xorg-server-1.8.0.diff
 Patch206:       fix_fglrx_screendepth_issue.patch
 Patch207:       xorg-server-option_libxf86config.diff
+Patch208:       xorg-evdev-conf.diff
 
 %description
 This package contains the X.Org Server.
@@ -253,6 +254,7 @@ popd
 %patch205 -p0
 %patch206 -p0
 %patch207 -p0
+%patch208 -p0
 
 %build
 pushd xorg-docs-*