diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 45211cd7d6..439effc1ed 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -29,9 +29,6 @@ get_graphicdrivers
   strip_linker_plugin
   strip_lto # Mesa fails to build with LTO optimization
 
-# TODO:
-  LDFLAGS=""
-
 if [ "$LLVM_SUPPORT" = "yes" ]; then
   export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
 fi
@@ -50,6 +47,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
             --localstatedir=/var \
             --disable-static \
             --enable-shared \
+            --enable-shared-dricore \
             --disable-debug \
             --disable-selinux \
             --enable-xcb \
diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install
index 99fbcde653..bbaa1750e2 100755
--- a/packages/graphics/Mesa/install
+++ b/packages/graphics/Mesa/install
@@ -27,6 +27,8 @@ mkdir -p $INSTALL/usr/lib
     ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
     ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
   cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/dri
   cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true