diff --git a/common/shlibs b/common/shlibs
index 3924529f28..66c4ea0fbc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -994,8 +994,8 @@ libkeyutils.so.1 libkeyutils-1.5.5_1
 libiptcdata.so.0 libiptcdata-1.0.4_1
 libutempter.so.0 libutempter-1.1.5_1
 libxatracker.so.1 MesaLib-7.11_1
-libdricore9.1.5.so.1 MesaLib-9.1.5_1
-libllvmradeon9.1.5.so MesaLib-9.1.5_1
+libdricore9.1.6.so.1 MesaLib-9.1.6_1
+libllvmradeon9.1.6.so MesaLib-9.1.6_1
 libtumbler-1.so.0 tumbler-4.9.2_1
 libwebrtc_audio_processing.so.0 webrtc-audio-processing-0.1_1
 libcupsmime.so.1 libcups-1.5.3_1
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 49b1e65a5e..331a807f20 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,6 +1,6 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
-version=9.1.5
+version=9.1.6
 revision=1
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
@@ -8,7 +8,7 @@ configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
  --enable-gles1 --enable-gles2 --enable-openvg --enable-egl
  --with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-vdpau --enable-xa
  --enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
- --with-gallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau --enable-gbm
+ --with-gallium-drivers=r300,r600,svga,swrast,nouveau --enable-gbm
  --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast
  --with-egl-platforms=drm,wayland"
 short_desc="Graphics library similar to SGI's OpenGL"
@@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mesa3d.org/"
 license="MIT, LGPL-2.1"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
-checksum=89ea0d1afd90a87dab253777bfe414820c4aa3890add1487ca2b49f6b3e194fd
+checksum=e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d
 
 hostmakedepends="automake libtool flex pkg-config llvm>=3.3"
 makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
@@ -36,7 +36,7 @@ libgbm_package() {
 	short_desc="generic buffer management API -- runtime"
 	replaces="MesaLib<9.0.2"
 	pkg_install() {
-		vmove "usr/lib/libgbm.so*"
+		vmove "usr/lib/libgbm.so.*"
 		vmove usr/lib/gbm/gbm_gallium_drm.so
 	}
 }
@@ -45,7 +45,7 @@ libEGL_package() {
 	short_desc="Free implementation of the EGL API - runtime"
 	replaces="MesaLib<7.11_2"
 	pkg_install() {
-		vmove "usr/lib/libEGL*.so*"
+		vmove "usr/lib/libEGL*.so.*"
 	}
 }
 
@@ -53,7 +53,7 @@ libglapi_package() {
 	short_desc="Free implementation of the GL API - shared library"
 	replaces="MesaLib<7.11_2"
 	pkg_install() {
-		vmove "usr/lib/libglapi.so*"
+		vmove "usr/lib/libglapi.so.*"
 	}
 }
 
@@ -61,7 +61,7 @@ libGLES_package() {
 	short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API"
 	replaces="MesaLib<7.11_2"
 	pkg_install() {
-		vmove "usr/lib/libGLES*.so*"
+		vmove "usr/lib/libGLES*.so.*"
 	}
 }
 
@@ -69,7 +69,7 @@ libGL_package() {
 	short_desc="Free implementation of the OpenGL API - GLX runtime"
 	replaces="MesaLib<7.11_2"
 	pkg_install() {
-		vmove "usr/lib/libGL*.so*"
+		vmove "usr/lib/libGL*.so.*"
 	}
 }
 
@@ -77,7 +77,7 @@ libOpenVG_package() {
 	short_desc="Free implementation of the OpenVG API - runtime"
 	replaces="MesaLib<7.11_2"
 	pkg_install() {
-		vmove "usr/lib/libOpenVG.so*"
+		vmove "usr/lib/libOpenVG.so.*"
 	}
 }
 
@@ -85,14 +85,14 @@ libOSMesa_package() {
 	short_desc="Mesa Off-Screen interface library"
 	replaces="MesaLib<7.11_2"
 	pkg_install() {
-		vmove "usr/lib/libOSMesa.so*"
+		vmove "usr/lib/libOSMesa.so.*"
 	}
 }
 
 libwayland-egl_package() {
 	short_desc="Free implementation of the EGL API - wayland runtime"
 	pkg_install() {
-		vmove "usr/lib/libwayland-egl.*"
+		vmove "usr/lib/libwayland-egl.so.*"
 		vmove usr/lib/egl
 	}
 }
@@ -109,6 +109,7 @@ MesaLib-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }
 
@@ -118,11 +119,11 @@ mesa-ati-dri_package() {
 	pkg_install() {
 		vmove "usr/lib/libXvMCr[36]00.so*"
 		vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
-		vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
+		#vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
 		vmove "usr/lib/xorg/modules/dri/radeon*"
 		vmove "usr/lib/xorg/modules/dri/r[236]00*"
 		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
-		vmove usr/lib/gallium-pipe/pipe_radeonsi.so
+		#vmove usr/lib/gallium-pipe/pipe_radeonsi.so
 	}
 }