diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 36534bd..d611023 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 19 15:16:22 CEST 2009 - sndirsch@suse.de
+
+- add 'Option "AutoAddDevices" "off"' to xorg.conf only as
+  documented comment, since it caused a lot of confusion
+  (bnc #548085 and various others)
+
 -------------------------------------------------------------------
 Mon Oct 12 16:48:47 CEST 2009 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 35c8035..5a046eb 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:        60
+Release:        61
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -487,16 +487,21 @@ 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
+ # Document how to restore previous input driver behaviour in xorg.conf files created
+ # on openSUSE <= 11.1
  if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then
+  if ! grep -q "\"AutoAddDevices\" \"off\"" etc/X11/xorg.conf; then
    sed -i '
 /Section "ServerFlags"/{
 h
 g
 a\
-  Option       "AutoAddDevices" "off"
+  # Uncomment the following option to reenable kbd/mouse driver input sections. \
+  # Otherwise evdev driver is used. \
+  #Option       "AutoAddDevices" "off"
 }
 '  etc/X11/xorg.conf
+  fi
  fi
 fi
 %endif