diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 35951a07c4..5d03fb0bdc 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -19,7 +19,6 @@ $SCRIPTS/build inputproto
 $SCRIPTS/build xf86dgaproto
 $SCRIPTS/build xf86driproto
 $SCRIPTS/build xf86miscproto
-$SCRIPTS/build libfontenc
 $SCRIPTS/build libpciaccess
 $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
@@ -39,6 +38,10 @@ else
   XORG_XINERAMA="--disable-xinerama"
 fi
 
+# ensure we dont use size optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O3|"`
+  CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-Os|-O3|"`
+
 cd $PKG_BUILD
 
 $AUTORECONF
@@ -53,7 +56,10 @@ $AUTORECONF
             --enable-shared \
             --disable-debug \
             --disable-builddocs \
+            --disable-strict-compilation \
             --enable-largefile \
+            --enable-visibility \
+            --enable-pc98=auto \
             --enable-install-libxf86config \
             --disable-xselinux \
             --with-pic \
@@ -88,6 +94,7 @@ $AUTORECONF
             --disable-config-hal \
             --enable-xfree86-utils \
             --enable-xorg \
+            --disable-windowswm \
             --disable-dmx \
             --disable-xvfb \
             --disable-xnest \