diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index d611023..c3848f7 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  2 10:05:55 CET 2009 - sndirsch@suse.de
+
+- build Xserver again with '-O2' instead of '-O0', which had been
+  an unintentional change (bnc #551789)
+
 -------------------------------------------------------------------
 Mon Oct 19 15:16:22 CEST 2009 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 5a046eb..a5c4ece 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:        61
+Release:        62
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -297,7 +297,7 @@ popd
 autoreconf -fi
 # DRI2 disabled for Xserver 1.5 as libdrm 2.3.1 doesn't have the
 # drmBO functionality.
-./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -O0 -g" \
+./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 %if %fglrx_driver_hack
             --with-release-major=7 \
             --with-release-minor=2 \