diff --git a/packages/graphics/mesa-master-GL/build b/packages/graphics/mesa-master-GL/build
new file mode 100755
index 0000000000..abcd331ce4
--- /dev/null
+++ b/packages/graphics/mesa-master-GL/build
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+. config/options $1
+
+$SCRIPTS/unpack $MESA
+$SCRIPTS/build libxml2-host
+$SCRIPTS/build talloc
+$SCRIPTS/build expat
+$SCRIPTS/build glproto
+$SCRIPTS/build dri2proto
+$SCRIPTS/build $LIBDRM
+$SCRIPTS/build libXext
+$SCRIPTS/build libXdamage
+$SCRIPTS/build libXfixes
+$SCRIPTS/build libXxf86vm
+$SCRIPTS/build libxcb
+$SCRIPTS/build libX11
+
+cd $BUILD/$MESA*
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static \
+            --enable-shared \
+            --disable-debug \
+            --disable-selinux \
+            --enable-xcb \
+            --disable-glx-tls \
+            --enable-driglx-direct \
+            --disable-egl \
+            --disable-glu \
+            --disable-gl-osmesa \
+            --disable-glut \
+            --disable-glw \
+            --disable-motif \
+            --with-driver=dri \
+            --disable-gallium
+
+  make -C src/glx
+  make -C src/mesa gl.pc
+  make -C src/mesa/drivers/dri dri.pc
+
+  mkdir -p $SYSROOT_PREFIX/usr/include/GL
+    cp include/GL/*.h $SYSROOT_PREFIX/usr/include/GL
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp -P lib/libGL.so* $SYSROOT_PREFIX/usr/lib/pkgconfig
+  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
+    cp src/mesa/gl.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+
+  mkdir -p $SYSROOT_PREFIX/usr/include/GL/internal
+    cp include/GL/internal/dri_interface.h $SYSROOT_PREFIX/usr/include/GL/internal
+  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
+    cp src/mesa/drivers/dri/dri.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
diff --git a/packages/graphics/mesa-master/build b/packages/graphics/mesa-master/build
index c609bd74af..a8be0a76fc 100755
--- a/packages/graphics/mesa-master/build
+++ b/packages/graphics/mesa-master/build
@@ -14,11 +14,15 @@ $SCRIPTS/build libXfixes
 $SCRIPTS/build libXxf86vm
 $SCRIPTS/build libxcb
 $SCRIPTS/build libX11
+$SCRIPTS/build xorg-server
 
 get_graphicdrivers
 
+# dont use strip because of use from mklib
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-s||"`
+
 MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
-MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga"
+MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast"
 
 for drv in $GRAPHIC_DRIVERS; do
   [ $drv = i915 ] && \
@@ -36,11 +40,18 @@ 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"
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx,xorg"
+
+  [ $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"
 done
 
 cd $PKG_BUILD
 
+make clean
+
 HOST_CC=$HOST_CC \
 HOST_OPT_FLAGS="$HOST_CFLAGS" \
 X11_INCLUDES= \
diff --git a/packages/graphics/mesa-master/install b/packages/graphics/mesa-master/install
index ee241f4e41..8ee9847a75 100755
--- a/packages/graphics/mesa-master/install
+++ b/packages/graphics/mesa-master/install
@@ -21,3 +21,6 @@ mkdir -p $INSTALL/usr/lib
 mkdir -p $INSTALL/usr/lib/dri
   cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
   cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true
+
+mkdir -p $INSTALL/usr/lib/xorg/modules/drivers
+  cp -P $PKG_BUILD/lib/gallium/*_drv.so $INSTALL/usr/lib/xorg/modules/drivers || true