diff --git a/mfb_without_xorg.diff b/mfb_without_xorg.diff
new file mode 100644
index 0000000..0b65b28
--- /dev/null
+++ b/mfb_without_xorg.diff
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2007-11-18 14:40:43.363103865 +0100
++++ configure.ac	2007-11-18 14:41:10.763089274 +0100
+@@ -1659,7 +1659,7 @@
+ AM_CONDITIONAL(MFB, [test "x$MFB" = xyes])
+ AM_CONDITIONAL(CFB, [test "x$CFB" = xyes])
+ AM_CONDITIONAL(AFB, [test "x$AFB" = xyes])
+-if test "x$MFB" = xyes -o "x$CFB" = xyes -o "x$AFB" = xyes; then
++if test "x$CFB" = xyes -o "x$AFB" = xyes; then
+ 	if test "x$XORG" != xyes; then
+ 		AC_MSG_ERROR([legacy fb support requires the Xorg server])
+ 	fi
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 1e782e3..e160b97 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 18 14:14:22 CET 2007 - sndirsch@suse.de
+
+- s390(x): allow mfb build without Xorg server being built
+
 -------------------------------------------------------------------
 Thu Nov 15 22:00:47 CET 2007 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 859b928..ff15da2 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        27
+Release:        29
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -89,6 +89,7 @@ Patch81:        xserver-1.3.0-xkb-and-loathing.patch
 Patch83:        ia64linuxPciInit.diff
 Patch84:        commit-feac075.diff
 Patch85:        commit-29e0e18.diff
+Patch86:        mfb_without_xorg.diff
 
 %description
 This package contains the X.Org Server.
@@ -204,6 +205,7 @@ popd
 %patch83
 %patch84 -p1
 %patch85 -p1
+%patch86 -p0
 
 %build
 pushd xorg-docs-*
@@ -253,6 +255,7 @@ autoreconf -fi
 %ifarch s390 s390x
             --disable-dri \
             --disable-xorg \
+            --enable-mfb \
 %else
             --enable-dri \
             --enable-xorg \
@@ -317,11 +320,11 @@ rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4
 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
 install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/nvidia
 %endif
-#%if %vnc
-#%ifarch s390 s390x
-#rm $RPM_BUILD_ROOT/mfb.h
-#%endif
-#%endif
+%if %vnc
+%ifarch s390 s390x
+rm $RPM_BUILD_ROOT/mfb.h
+%endif
+%endif
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -532,6 +535,8 @@ exit 0
 /usr/bin/Xvnc
 %endif
 %changelog
+* Sun Nov 18 2007 - sndirsch@suse.de
+- s390(x): allow mfb build without Xorg server being built
 * Thu Nov 15 2007 - sndirsch@suse.de
 - commit-29e0e18.diff
   * Make config file preferred mode override monitor preferred