diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 62c763cf20..2f66279a2f 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,12 +1,12 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=9.2.1
-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/dri --enable-vdpau
+ --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-dri-drivers=i915,i965,r200,radeon,nouveau,swrast
@@ -100,11 +100,11 @@ libwayland-egl_package() {
 MesaLib-devel_package() {
 	depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
 		libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39 expat-devel
-		libGL-${version}_${revision} libOpenVG-${version}_${revision}
-		libGLES-${version}_${revision} libEGL-${version}_${revision}
-		libOSMesa-${version}_${revision} libgbm-${version}_${revision}
-		libwayland-egl-${version}_${revision}
-		${sourcepkg}-${version}_${revision}"
+		libGL>=${version}_${revision} libOpenVG>=${version}_${revision}
+		libGLES>=${version}_${revision} libEGL>=${version}_${revision}
+		libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
+		libwayland-egl>=${version}_${revision}
+		${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -120,8 +120,8 @@ mesa-ati-dri_package() {
 		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/xorg/modules/dri/radeon*"
-		vmove "usr/lib/xorg/modules/dri/r[236]00*"
+		vmove "usr/lib/xorg/modules/drivers/radeon*"
+		vmove "usr/lib/xorg/modules/drivers/r[236]00*"
 		vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
 		vmove usr/lib/gallium-pipe/pipe_radeonsi.so
 	}
@@ -130,7 +130,7 @@ mesa-ati-dri_package() {
 mesa-intel-dri_package() {
 	short_desc="Mesa DRI drivers for Intel GPUs"
 	pkg_install() {
-		vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*"
+		vmove "usr/lib/xorg/modules/drivers/i9[16]5_dri.*"
 	}
 }
 
@@ -140,7 +140,7 @@ mesa-nouveau-dri_package() {
 	pkg_install() {
 		vmove "usr/lib/libXvMCnouveau.so*"
 		vmove "usr/lib/vdpau/libvdpau_nouveau.so*"
-		vmove "usr/lib/xorg/modules/dri/nouveau*"
+		vmove "usr/lib/xorg/modules/drivers/nouveau*"
 		vmove usr/lib/gallium-pipe/pipe_nouveau.so
 	}
 }
@@ -151,7 +151,7 @@ mesa-swraster-dri_package() {
 	pkg_install() {
 		vmove "usr/lib/libXvMCsoftpipe.so*"
 		vmove "usr/lib/vdpau/libvdpau_softpipe.so*"
-		vmove "usr/lib/xorg/modules/dri/swrast*"
+		vmove "usr/lib/xorg/modules/drivers/swrast*"
 		vmove "usr/lib/gallium-pipe/pipe_swrast.so"
 	}
 }
@@ -160,7 +160,7 @@ mesa-vmwgfx-dri_package() {
 	short_desc="Mesa DRI drivers for VMware"
 	replaces="MesaLib<9.0.2"
 	pkg_install() {
-		vmove "usr/lib/xorg/modules/dri/vmwgfx*"
+		vmove "usr/lib/xorg/modules/drivers/vmwgfx*"
 		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
 	}
 }