diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index be28fe8..be4fe05 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 10 15:44:07 CEST 2009 - sndirsch@suse.de
+
+- %post: modify xorg.conf if required
+  * do not change input driver behaviour for existing X.Org
+    configurations
+
 -------------------------------------------------------------------
 Wed Sep  9 23:29:33 CEST 2009 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 9028298..885aae5 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -33,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        52
+Release:        53
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -481,6 +481,17 @@ if [ -f etc/X11/xorg.conf ]; then
    sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \
      etc/X11/xorg.conf
  fi
+ # do not change input driver behaviour for existing X.Org configurations
+ if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then
+   sed -i '
+/Section "ServerFlags"/{
+h
+g
+a\
+  Option       "AutoAddDevices" "off"
+}
+'  etc/X11/xorg.conf
+ fi
 fi
 %endif
 # Installation of init script seems to be disabled by default