diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 2d98cab5d6..200e6a8d44 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -37,10 +37,10 @@ MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disa
 
 for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = i915 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/disable-gallium-i915/'`
 
   [ "$drv" = i965 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/disable-gallium-i965/'`
 
   [ "$drv" = radeon ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'`
@@ -51,18 +51,16 @@ for drv in $GRAPHIC_DRIVERS; do
   [ "$drv" = nouveau ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'` && \
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx,xorg"
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx"
 
   [ "$drv" = vmware ] && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
     MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'` && \
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx,xorg"
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx"
 done
 
 cd $PKG_BUILD
 
-make clean
-
 HOST_CC="$HOST_CC" \
 HOST_OPT_FLAGS="$HOST_CFLAGS" \
 X11_INCLUDES= \
@@ -86,11 +84,10 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --disable-glut \
             --disable-glw \
             --disable-motif \
-            --with-driver=dri \
-            --with-dri-drivers="$MESA_DRIVERS" \
-            --with-dri-driverdir="$XORG_PATH_DRI" \
-            --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
             $MESA_CONFIG \
+            --with-driver="dri" \
+            --with-dri-drivers="$MESA_DRIVERS" \
+            --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
 
 make
 
diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta
index 18f1290e60..30bd7bf4ed 100644
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXdamage libdrm talloc expat libXext libXfixes libXxf86vm libxcb libX11"
-PKG_BUILD_DEPENDS="toolchain libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 xorg-server"
+PKG_BUILD_DEPENDS="toolchain libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"