diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 4331341d41..585c8ef57f 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -21,7 +21,7 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
 $SCRIPTS/build libXv
-# $SCRIPTS/build libXvMC
+$SCRIPTS/build libXinerama
 $SCRIPTS/build $LIBDRM
 $SCRIPTS/build $MESA
 $SCRIPTS/build openssl
@@ -31,15 +31,6 @@ $SCRIPTS/build pixman
 $SCRIPTS/build fontsproto
 $SCRIPTS/build xf86bigfontproto
 $SCRIPTS/build udev
-#$SCRIPTS/build dbus
-#$SCRIPTS/build hal
-
-if [ "$XINERAMA" = "yes" ]; then
-  $SCRIPTS/build libXinerama
-  XORG_CONFIG="$XORG_CONFIG --enable-xinerama"
-else
-  XORG_CONFIG="$XORG_CONFIG --disable-xinerama"
-fi
 
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
@@ -109,7 +100,7 @@ cd $PKG_BUILD
             --with-log-dir=/var/log \
             --with-dri-driver-path=$XORG_PATH_DRI \
             --with-fontdir=$XORG_PATH_FONTS \
-            --with-default-font-path="$XORG_PATH_FONTS/liberation,$XORG_PATH_FONTS/misc" \
+            --with-default-font-path="$XORG_PATH_FONTS/misc" \
             $XORG_CONFIG \
 
 make
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index d955c2f591..138c3fdd9f 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -7,6 +7,7 @@ $SCRIPTS/install freetype
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
 $SCRIPTS/install libXv
+$SCRIPTS/install libXinerama
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman
@@ -14,10 +15,6 @@ $SCRIPTS/install udev
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
-if [ "$XINERAMA" = "yes" ]; then
-  $SCRIPTS/install libXinerama
-fi
-
 XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"