diff --git a/packages/graphics/Mesa-master/build b/packages/graphics/Mesa-master/build
index 6b6950c7f4..8b120252ff 100755
--- a/packages/graphics/Mesa-master/build
+++ b/packages/graphics/Mesa-master/build
@@ -31,12 +31,11 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --disable-xcb \
             --disable-glx-tls \
             --enable-driglx-direct \
-            --disable-egl \
+            --enable-egl \
             --disable-gl-osmesa \
             --disable-glu \
             --disable-glut \
             --disable-glw \
-            --disable-gallium \
             --disable-motif \
             --with-driver=dri \
             --with-dri-drivers=$DRIDRIVERS \
@@ -44,12 +43,14 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
             --with-x \
             --without-demos \
-#            --enable-gallium-intel \
-#            --enable-gallium-radeon \
-#            --enable-gallium-nouveau \
+            --enable-gallium \
+            --enable-gallium-intel \
+            --disable-gallium-radeon \
+            --disable-gallium-nouveau \
 
 make
 
 make -C progs/xdemos
+make -C progs/egl
 
 $MAKEINSTALL -C src/mesa
diff --git a/packages/graphics/Mesa-master/install b/packages/graphics/Mesa-master/install
index 4a75504331..c572cfadb7 100755
--- a/packages/graphics/Mesa-master/install
+++ b/packages/graphics/Mesa-master/install
@@ -16,7 +16,18 @@ cp -PR $PKG_BUILD/lib/libGL.so* $INSTALL/usr/lib
 #cp -PR $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dri
-cp -PR $PKG_BUILD/lib*/*_dri.so $INSTALL/usr/lib/dri
+cp -PR $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri
 
 mkdir -p $INSTALL/usr/bin
 cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo} $INSTALL/usr/bin
+
+# for testing:
+
+mkdir -p $INSTALL/usr/lib
+cp -PR $PKG_BUILD/lib/libEGL.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/usr/lib/dri
+cp -PR $PKG_BUILD/lib/gallium/EGL_i915.so $INSTALL/usr/lib/dri
+
+mkdir -p $INSTALL/usr/bin/egl
+cp -PR $PKG_BUILD/progs/egl/{demo1,demo2,demo3,eglgears,eglinfo,eglscreen,egltri} $INSTALL/usr/bin/egl