diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 0d19e62..0a89e4e 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  3 17:36:16 UTC 2011 - sndirsch@novell.com
+
+- disabled build of Xvnc and moved Xvfb to main package;
+  xorg-x11-Xvnc will be a seperate package (bnc #660208)
+
 -------------------------------------------------------------------
 Mon Jan 10 16:01:13 CET 2011 - vuntz@opensuse.org
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6655766..021b9f9 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -21,7 +21,7 @@
 
 Name:           xorg-x11-server
 %define dirsuffix 1.9.3
-%define vnc 1
+%define vnc 0
 BuildRequires:  Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
 ### udev support (broken on openSUSE 11.2, see also bnc #589997)
 %if %suse_version > 1120
@@ -45,8 +45,8 @@ Provides:       VIDEO_ABI_VERSION = 8
 Provides:       INPUT_ABI_VERSION = 11
 Requires:       libpixman-1-0 >= 0.15.2
 %endif
-Provides:       xorg-x11-server-glx
-Obsoletes:      xorg-x11-server-glx
+Provides:       xorg-x11-server-glx xorg-x11-Xvfb
+Obsoletes:      xorg-x11-server-glx xorg-x11-Xvfb
 Summary:        X.Org Server
 Source:         xorg-server-%{dirsuffix}.tar.bz2
 Source1:        sysconfig.displaymanager.template
@@ -134,16 +134,16 @@ This package contains the X.Org Server.
 
 %package extra
 License:        GPLv2+ ; MIT License (or similar)
-Summary:        Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb)
+Summary:        Additional Xservers (Xdmx, Xephyr, Xnest)
 Group:          System/X11/Servers/XF86_4
-Provides:       xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xvfb
-Obsoletes:      xorg-x11-Xnest xorg-x11-Xvfb
+Provides:       xorg-x11-Xnest
+Obsoletes:      xorg-x11-Xnest
 Requires:       xorg-x11-fonts-core xorg-x11 Mesa
 Requires:       xkeyboard-config
 AutoReqProv:    on
 
 %description extra
-This package contains additional Xservers (Xdmx, Xephyr, Xnest, Xvfb).
+This package contains additional Xservers (Xdmx, Xephyr, Xnest).
 
 
 
@@ -400,7 +400,6 @@ exit 0
 %exclude %{_mandir}/man1/Xdmx.1*
 %exclude %{_mandir}/man1/Xephyr.1*
 %exclude %{_mandir}/man1/Xnest.1*
-%exclude %{_mandir}/man1/Xvfb.1*
 %{_mandir}/man7/*
 /var/lib/xkb/compiled/README.compiled
 %ifnarch s390 s390x
@@ -410,6 +409,7 @@ exit 0
 /etc/modprobe.d/50-nvidia.conf
 %verify(not mode) /usr/bin/Xorg
 /usr/bin/X
+/usr/bin/Xvfb
 /usr/bin/cvt
 /usr/bin/gtf
 /usr/%{_lib}/xorg/modules/
@@ -424,7 +424,6 @@ exit 0
 %defattr(-,root,root)
 /usr/bin/Xephyr
 /usr/bin/Xnest
-/usr/bin/Xvfb
 /usr/bin/Xdmx
 /usr/bin/dmxaddinput
 /usr/bin/dmxaddscreen
@@ -440,7 +439,6 @@ exit 0
 %{_mandir}/man1/Xdmx.1*
 %{_mandir}/man1/Xephyr.1*
 %{_mandir}/man1/Xnest.1*
-%{_mandir}/man1/Xvfb.1*
 
 %files sdk
 %defattr(-,root,root)