diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index cac73b924c..854ee5d958 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=10.2.4
-revision=5
+revision=6
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@@ -23,6 +23,10 @@ makedepends="
  libXdamage-devel libXvMC-devel>=1.0.6 libxshmfence-devel wayland-devel
  elfutils-devel ncurses-devel zlib-devel libffi-devel"
 
+# Set subpackages manually to set proper rdeps in 32bit pkgs.
+subpackages="libglapi libgbm libEGL libGL libGLES libOpenVG libOSMesa
+ libwayland-egl MesaLib-devel mesa-swraster-dri"
+
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
 	# Enable all x86 drivers.
@@ -31,6 +35,8 @@ i686*|x86_64*)
 	configure_args+=" --enable-xa --enable-dri3"
 	configure_args+=" --enable-opencl --enable-opencl-icd --enable-r600-llvm-compiler"
 	hostmakedepends+=" clang libclc-devel-git"
+	subpackages+=" libxatracker mesa-ati-dri mesa-intel-dri mesa-nouveau-dri"
+	subpackages+=" mesa-vmwgfx-dri mesa-opencl"
 	;;
 *)
 	# Enable swrast driver.
@@ -57,15 +63,6 @@ post_install() {
 	ln -s libglx-xorg.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
 }
 
-libgbm_package() {
-	short_desc="Mesa Generic buffer management API - runtime"
-	replaces="MesaLib<9.0.2"
-	pkg_install() {
-		vmove "usr/lib/libgbm.so.*"
-		vmove usr/lib/gbm/gbm_gallium_drm.so
-	}
-}
-
 libglapi_package() {
 	depends="libudev"
 	short_desc="Free implementation of the GL API - shared library"
@@ -75,6 +72,15 @@ libglapi_package() {
 	}
 }
 
+libgbm_package() {
+	short_desc="Mesa Generic buffer management API - runtime"
+	replaces="MesaLib<9.0.2"
+	pkg_install() {
+		vmove "usr/lib/libgbm.so.*"
+		vmove usr/lib/gbm/gbm_gallium_drm.so
+	}
+}
+
 libEGL_package() {
 	short_desc="Free implementation of the EGL API - runtime"
 	replaces="MesaLib<7.11_2"
@@ -97,7 +103,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.*"
 		vmove usr/lib/xorg/modules/extensions
 	}
 }
@@ -154,8 +160,6 @@ mesa-swraster-dri_package() {
 	}
 }
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-
 libxatracker_package() {
 	short_desc="Mesa XA tracker interface library"
 	replaces="MesaLib<10.0.0_2"
@@ -214,5 +218,3 @@ mesa-opencl_package() {
 		mv ${XBPS_DESTDIR}/MesaLib-devel-${version}/usr/lib/lib*OpenCL.so ${PKGDESTDIR}/usr/lib
 	}
 }
-
-fi # x86