diff --git a/sys-libs/mesa/mesa-17.1.7.recipe b/sys-libs/mesa/mesa-17.1.10.recipe
similarity index 80%
rename from sys-libs/mesa/mesa-17.1.7.recipe
rename to sys-libs/mesa/mesa-17.1.10.recipe
index 121591d4f..719cffa89 100644
--- a/sys-libs/mesa/mesa-17.1.7.recipe
+++ b/sys-libs/mesa/mesa-17.1.10.recipe
@@ -4,21 +4,26 @@ specification. The OpenGL specification documents a system for rendering \
 interactive 3D graphics. Mesa fills the role of the Haiku OpenGL kit \
 providing 3D rendering to Haiku applications."
 HOMEPAGE="https://www.mesa3d.org/"
-COPYRIGHT="1999-2017 Brian Paul"
+COPYRIGHT="1999-2018 Brian Paul"
 LICENSE="MIT"
-REVISION="8"
+REVISION="1"
 SOURCE_URI="https://mesa.freedesktop.org/archive/mesa-${portVersion}.tar.xz"
-CHECKSUM_SHA256="69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5"
+CHECKSUM_SHA256="cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb"
 PATCHES="mesa-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion=1.0.0
+libOSMesaVersion=8.0.0
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+libOSMesaVersionCompat="$libOSMesaVersion compat >= ${libOSMesaVersion%%.*}"
+
 PROVIDES="
 	mesa$secondaryArchSuffix = $portVersion
-	lib:libGL$secondaryArchSuffix = 1.0.0 compat >= 1
-	lib:libEGL$secondaryArchSuffix = 1.0.0 compat >= 1
-	lib:libOSMesa$secondaryArchSuffix = 8.0.0 compat >= 8
+	lib:libEGL$secondaryArchSuffix = $libVersionCompat
+	lib:libGL$secondaryArchSuffix = $libVersionCompat
+	lib:libOSMesa$secondaryArchSuffix = $libOSMesaVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -27,9 +32,9 @@ REQUIRES="
 
 PROVIDES_devel="
 	mesa${secondaryArchSuffix}_devel = $portVersion
-	devel:libGL$secondaryArchSuffix = 1.0.0 compat >= 1
-	devel:libEGL$secondaryArchSuffix = 1.0.0 compat >= 1
-	devel:libOSMesa$secondaryArchSuffix = 8.0.0 compat >= 8
+	devel:libEGL$secondaryArchSuffix = $libVersionCompat
+	devel:libGL$secondaryArchSuffix = $libVersionCompat
+	devel:libOSMesa$secondaryArchSuffix = $libOSMesaVersionCompat
 	"
 REQUIRES_devel="
 	mesa$secondaryArchSuffix == $portVersion base
@@ -72,6 +77,12 @@ BUILD_PREREQUIRES="
 	cmd:which
 	"
 
+defineDebugInfoPackage mesa$secondaryArchSuffix \
+	"${addOnsDir/mesa$secondaryArchSuffix/mesa${secondaryArchSuffix}_swpipe}/opengl/Software Pipe" \
+	"$libDir"/libEGL.so.$libVersion \
+	"$libDir"/libGL.so.$libVersion \
+	"$libDir"/libOSMesa.so.$libOSMesaVersion \
+
 BUILD()
 {
 	if [ -n "$secondaryArchSuffix" ]; then
@@ -109,7 +120,6 @@ INSTALL()
 	mkdir -p $addOnsDir/opengl
 	mv $(find $libDir -name 'libswpipe.so') \
 		"$addOnsDir/opengl/Software Pipe"
-	strip -s "$addOnsDir/opengl/Software Pipe"
 	rm -rf $libDir/haiku
 
 	# Set some nice version info
@@ -145,5 +155,11 @@ INSTALL()
 	# swpipe renderer package
 	packageEntries swpipe \
 		"$addOnsDir/opengl/Software Pipe"
+
+	rmdir "$addOnsDir"/opengl
 }
 
+TEST()
+{
+	make check
+}
diff --git a/sys-libs/mesa/patches/mesa-17.1.7.patchset b/sys-libs/mesa/patches/mesa-17.1.10.patchset
similarity index 97%
rename from sys-libs/mesa/patches/mesa-17.1.7.patchset
rename to sys-libs/mesa/patches/mesa-17.1.10.patchset
index 25eb61024..f849c1ec4 100644
--- a/sys-libs/mesa/patches/mesa-17.1.7.patchset
+++ b/sys-libs/mesa/patches/mesa-17.1.10.patchset
@@ -5,7 +5,7 @@ Subject: Haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index fd346c8..0fdfb5b 100644
+index 3be6f54..e05f4d6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -272,6 +272,9 @@ case "$host_os" in
@@ -26,7 +26,7 @@ index fd346c8..0fdfb5b 100644
  
  dnl Add flags for gcc and g++
  if test "x$GCC" = xyes; then
-@@ -841,12 +845,18 @@ dnl According to the manual when using pthreads, one should add -pthread to
+@@ -862,12 +866,18 @@ dnl According to the manual when using pthreads, one should add -pthread to
  dnl both compile and link-time arguments.
  dnl In practise that should be sufficient for all platforms, since any
  dnl platforms build with GCC and Clang support the flag.
@@ -47,7 +47,7 @@ index fd346c8..0fdfb5b 100644
      pthread_stubs_possible="no"
      ;;
  * )
-@@ -1490,11 +1500,21 @@ require_dri_shared_libs_and_glapi() {
+@@ -1511,11 +1521,21 @@ require_dri_shared_libs_and_glapi() {
      if test "x$enable_dri" != xyes; then
          # There is only a single backend which won't be build/used otherwise.
          # XXX: Revisit this as the egl/haiku is a thing.
@@ -71,7 +71,7 @@ index fd346c8..0fdfb5b 100644
      fi
  }
  
-@@ -1710,6 +1730,10 @@ for plat in $platforms; do
+@@ -1731,6 +1751,10 @@ for plat in $platforms; do
  		DEFINES="$DEFINES -DHAVE_ANDROID_PLATFORM"
  		;;
  
@@ -82,7 +82,7 @@ index fd346c8..0fdfb5b 100644
  	*)
  		AC_MSG_ERROR([platform '$plat' does not exist])
  		;;
-@@ -2769,6 +2793,7 @@ AC_CONFIG_FILES([Makefile
+@@ -2790,6 +2814,7 @@ AC_CONFIG_FILES([Makefile
  		src/gallium/state_trackers/clover/Makefile
  		src/gallium/state_trackers/dri/Makefile
  		src/gallium/state_trackers/glx/xlib/Makefile
@@ -90,7 +90,7 @@ index fd346c8..0fdfb5b 100644
  		src/gallium/state_trackers/nine/Makefile
  		src/gallium/state_trackers/omx/Makefile
  		src/gallium/state_trackers/osmesa/Makefile
-@@ -2779,6 +2804,7 @@ AC_CONFIG_FILES([Makefile
+@@ -2800,6 +2825,7 @@ AC_CONFIG_FILES([Makefile
  		src/gallium/targets/d3dadapter9/Makefile
  		src/gallium/targets/d3dadapter9/d3d.pc
  		src/gallium/targets/dri/Makefile
@@ -98,7 +98,7 @@ index fd346c8..0fdfb5b 100644
  		src/gallium/targets/libgl-xlib/Makefile
  		src/gallium/targets/omx/Makefile
  		src/gallium/targets/opencl/Makefile
-@@ -2802,6 +2828,7 @@ AC_CONFIG_FILES([Makefile
+@@ -2823,6 +2849,7 @@ AC_CONFIG_FILES([Makefile
  		src/gallium/winsys/amdgpu/drm/Makefile
  		src/gallium/winsys/svga/drm/Makefile
  		src/gallium/winsys/sw/dri/Makefile
@@ -106,7 +106,7 @@ index fd346c8..0fdfb5b 100644
  		src/gallium/winsys/sw/kms-dri/Makefile
  		src/gallium/winsys/sw/null/Makefile
  		src/gallium/winsys/sw/wrapper/Makefile
-@@ -2817,6 +2844,8 @@ AC_CONFIG_FILES([Makefile
+@@ -2838,6 +2865,8 @@ AC_CONFIG_FILES([Makefile
  		src/glx/windows/Makefile
  		src/glx/windows/windowsdriproto.pc
  		src/gtest/Makefile