diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index d4d7eca..46d658c 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec  3 03:30:50 UTC 2010 - sndirsch@novell.com
+
+- remove Xorg setuid bit (bnc #632737) 
+
 -------------------------------------------------------------------
 Sun Nov 14 09:15:22 UTC 2010 - sndirsch@novell.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 48b4f63..b4bfc84 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -303,7 +303,8 @@ find $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/ -name "*.la" | \
   xargs rm
 install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
   $RPM_BUILD_ROOT/usr/include/xorg
-chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg
+# bnc #632737
+chmod u-s $RPM_BUILD_ROOT/usr/bin/Xorg
 mkdir -p $RPM_BUILD_ROOT/var/lib/X11
 ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/lib/X11/X
 ln -snf ../../var/lib/X11/X $RPM_BUILD_ROOT/usr/bin/X