diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index d3fe008814a..642a71f6729 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -5,11 +5,9 @@ revision=1
 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-gles1 --enable-gles2 --enable-openvg --enable-egl --enable-vdpau
+ --with-dri-driverdir=/usr/lib/xorg/modules/drivers
  --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
  --with-egl-platforms=drm,wayland"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -18,14 +16,33 @@ license="MIT, LGPL-2.1"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2"
 checksum=298e1950675e14f3386ec29d9b58e733b5e1eb7cf33a804787071852f5ecb2ff
 
-hostmakedepends="automake libtool flex pkg-config llvm>=3.3"
-makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
- libudev-devel>=183 libdrm-devel expat-devel talloc-devel libxml2-python
- libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel elfutils-devel zlib-devel"
+hostmakedepends="
+ automake libtool flex pkg-config llvm>=3.3 libxml2-python wayland-devel"
+makedepends="
+ glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
+ libudev-devel>=183 libdrm-devel expat-devel talloc-devel libvdpau-devel
+ libXvMC-devel>=1.0.6 wayland-devel elfutils-devel zlib-devel"
+
+case "$XBPS_TARGET_MACHINE" in
+i686*|x86_64*)
+	# Enable all x86 drivers.
+	configure_args+=" --with-gallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau"
+	configure_args+=" --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast"
+	configure_args+=" --enable-xa"
+	;;
+*)
+	# Enable swrast driver.
+	configure_args+=" --with-gallium-drivers=swrast"
+	configure_args+=" --with-dri-drivers=swrast"
+	configure_args+=" --disable-xa"
+	;;
+esac
+
 conf_files="/etc/drirc"
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
+	libtoolize -f
 }
 
 post_install() {
@@ -90,14 +107,6 @@ 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() {
@@ -112,8 +121,10 @@ MesaLib-devel_package() {
 		libGL>=${version}_${revision} libOpenVG>=${version}_${revision}
 		libGLES>=${version}_${revision} libEGL>=${version}_${revision}
 		libOSMesa>=${version}_${revision} libgbm>=${version}_${revision}
-		libwayland-egl>=${version}_${revision}
-		libxatracker>=${version}_${revision}"
+		libwayland-egl>=${version}_${revision}"
+	if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		depends+=" libxatracker>=${version}_${revision}"
+	fi
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -122,6 +133,26 @@ MesaLib-devel_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*"
+		vmove "usr/lib/gallium-pipe/pipe_swrast.so"
+	}
+}
+
+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"
+	pkg_install() {
+		vmove "usr/lib/libxatracker*.so.*"
+	}
+}
+
 mesa-ati-dri_package() {
 	short_desc="Mesa DRI drivers for ATI GPUs"
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -157,16 +188,6 @@ 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*"
-		vmove "usr/lib/gallium-pipe/pipe_swrast.so"
-	}
-}
-
 mesa-vmwgfx-dri_package() {
 	short_desc="Mesa DRI drivers for VMware"
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -176,3 +197,5 @@ mesa-vmwgfx-dri_package() {
 		vmove usr/lib/gallium-pipe/pipe_vmwgfx.so
 	}
 }
+
+fi # x86