diff --git a/packages/graphics/Mesa-master/build b/packages/graphics/Mesa-master/build
index 612ae81fed..818f318b3e 100755
--- a/packages/graphics/Mesa-master/build
+++ b/packages/graphics/Mesa-master/build
@@ -14,6 +14,12 @@ $SCRIPTS/build libX11
 
 get_graphicdrivers
 
+if [ $MESA_GLU = yes ]; then
+  MESA_CONFIG="$MESA_CONFIG --enable-glu"
+else
+  MESA_CONFIG="$MESA_CONFIG --disable-glu"
+fi
+
 cd $PKG_BUILD
 HOST_CC=$HOST_CC \
 OPT_FLAGS="$CFLAGS -D_GNU_SOURCE" \
@@ -35,7 +41,6 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --enable-driglx-direct \
             --disable-egl \
             --disable-gl-osmesa \
-            --enable-glu \
             --disable-glut \
             --disable-glw \
             --disable-motif \
diff --git a/packages/graphics/Mesa-master/install b/packages/graphics/Mesa-master/install
index aa3011c40d..44701dfeb5 100755
--- a/packages/graphics/Mesa-master/install
+++ b/packages/graphics/Mesa-master/install
@@ -11,8 +11,7 @@ $SCRIPTS/install libXxf86vm
 $SCRIPTS/install libX11
 
 mkdir -p $INSTALL/usr/lib
-cp -PR $PKG_BUILD/lib/libGL.so* $INSTALL/usr/lib
-cp -PR $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
+cp -PR $PKG_BUILD/lib/libGL*.so* $INSTALL/usr/lib
 # cp -PR $PKG_BUILD/lib/libEGL.so* $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dri