diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index a0512a7e8e4..da9e034aa88 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=20.0.1
-revision=1
+revision=2
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -38,10 +38,10 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
 case "$XBPS_TARGET_MACHINE" in
 i686*|x86_64*)
 	# Enable all x86 drivers.
-	configure_args+=" -Dgallium-drivers=r300,r600,radeonsi,svga,swrast,nouveau,virgl"
-	configure_args+=" -Ddri-drivers=i915,i965,r100,r200,nouveau"
+	configure_args+=" -Dgallium-drivers=auto"
+	configure_args+=" -Ddri-drivers=auto"
 	configure_args+=" -Dgallium-xa=true -Ddri3=true -Dgallium-nine=true"
-	configure_args+=" -Dvulkan-drivers=intel,amd"
+	configure_args+=" -Dvulkan-drivers=auto"
 	configure_args+=" -Dgallium-opencl=icd"
 	configure_args+=" -Dvulkan-overlay-layer=true"
 	hostmakedepends+=" clang"
@@ -72,7 +72,7 @@ ppc*)
 	;;
 aarch64*)
 	# Enable all ARM drivers
-	configure_args+=" -Dgallium-drivers=etnaviv,freedreno,kmsro,lima,panfrost,nouveau,swrast,tegra,v3d,vc4"
+	configure_args+=" -Dgallium-drivers=auto"
 	configure_args+=" -Dvulkan-drivers= -Ddri-drivers="
 	configure_args+=" -Dgallium-xa=false -Ddri3=true"
 	subpackages+=" mesa-dri mesa-vaapi mesa-vdpau mesa-XvMC"
@@ -81,7 +81,7 @@ aarch64*)
 	subpackages+=" mesa-etnaviv-dri mesa-freedreno-dri mesa-lima-dri mesa-panfrost-dri"
 	;;
 armv7l*)
-	configure_args+=" -Dgallium-drivers=etnaviv,freedreno,kmsro,lima,panfrost,swrast,vc4"
+	configure_args+=" -Dgallium-drivers=auto"
 	configure_args+=" -Dvulkan-drivers= -Ddri-drivers= -Dgallium-xvmc=false"
 	configure_args+=" -Dgallium-xa=false -Dgallium-vdpau=false -Dgallium-va=false"
 	subpackages+=" mesa-dri"