diff --git a/common/shlibs b/common/shlibs
index df9bf6548c..75fb3f2a65 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -993,8 +993,7 @@ libwx_gtk2u_svg-2.8.so.0 wxGTK-2.8.12.1_1
 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
-libdricore10.0.0.so.1 MesaLib-10.0.0_1
+libxatracker.so.2 libxatracker-10.0.0_2
 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 c67743724f..b1d440e77a 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,14 +1,14 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.0.0
-revision=1
+revision=2
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
  --enable-gles1 --enable-gles2 --enable-openvg --enable-egl --enable-xa
  --with-dri-driverdir=/usr/lib/xorg/modules/drivers --enable-vdpau
  --enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
- --with-gallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau
+ --with-gallium-drivers=r300,r600,ilo,radeonsi,svga,swrast,nouveau
  --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast
  --with-egl-platforms=drm,wayland"
 short_desc="Graphics library similar to SGI's OpenGL"
@@ -89,6 +89,14 @@ libOSMesa_package() {
 	}
 }
 
+libxatracker_package() {
+	short_desc="Mesa XA tracker interface library"
+	replaces="MesaLib<10.0.0_2"
+	pkg_install() {
+		vmove "usr/lib/libxatracker*.so.*"
+	}
+}
+
 libwayland-egl_package() {
 	short_desc="Free implementation of the EGL API - wayland runtime"
 	pkg_install() {
@@ -104,7 +112,7 @@ MesaLib-devel_package() {
 		libGLES>=${version}_${revision} libEGL>=${version}_${revision}
 		libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
 		libwayland-egl>=${version}_${revision}
-		${sourcepkg}>=${version}_${revision}"
+		libxatracker>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -115,6 +123,7 @@ MesaLib-devel_package() {
 
 mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs"
+	depends="${sourcepkg}>=${version}_${revision}"
 	replaces="MesaLib<9.0.2"
 	pkg_install() {
 		vmove "usr/lib/libXvMCr[36]00.so*"
@@ -129,6 +138,7 @@ mesa-ati-dri_package() {
 
 mesa-intel-dri_package() {
 	short_desc="Mesa DRI drivers for Intel GPUs"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
 	}
@@ -136,6 +146,7 @@ mesa-intel-dri_package() {
 
 mesa-nouveau-dri_package() {
 	short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)"
+	depends="${sourcepkg}>=${version}_${revision}"
 	replaces="MesaLib<9.0.2"
 	pkg_install() {
 		vmove "usr/lib/libXvMCnouveau.so*"
@@ -147,6 +158,7 @@ mesa-nouveau-dri_package() {
 
 mesa-swraster-dri_package() {
 	short_desc="Mesa DRI drivers for the Software Rasterizer"
+	depends="${sourcepkg}>=${version}_${revision}"
 	replaces="MesaLib<9.0.2"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/swrast*"
@@ -156,6 +168,7 @@ mesa-swraster-dri_package() {
 
 mesa-vmwgfx-dri_package() {
 	short_desc="Mesa DRI drivers for VMware"
+	depends="${sourcepkg}>=${version}_${revision}"
 	replaces="MesaLib<9.0.2"
 	pkg_install() {
 		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
@@ -165,7 +178,6 @@ mesa-vmwgfx-dri_package() {
 
 MesaLib_package() {
 	conf_files="/etc/drirc"
-	depends="mesa-swraster-dri-${version}_${revision}"
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/libxatracker b/srcpkgs/libxatracker
new file mode 120000
index 0000000000..8bf5fbea21
--- /dev/null
+++ b/srcpkgs/libxatracker
@@ -0,0 +1 @@
+MesaLib
\ No newline at end of file