diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template
index e3efc92809f..858e88f63d1 100644
--- a/srcpkgs/MesaLib/MesaLib-devel.template
+++ b/srcpkgs/MesaLib/MesaLib-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glproto
 Add_dependency run dri2proto  	">=2.1"
 Add_dependency run libXext-devel
@@ -24,6 +22,8 @@ Add_dependency run libGLES	">=${version}"
 Add_dependency run libGLU	">=${version}"
 Add_dependency run libEGL	">=${version}"
 
+noarch=yes
+
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
diff --git a/srcpkgs/MesaLib/MesaLib.rshlibs b/srcpkgs/MesaLib/MesaLib.rshlibs
index b1a2cb48cbd..e8c464a574e 100644
--- a/srcpkgs/MesaLib/MesaLib.rshlibs
+++ b/srcpkgs/MesaLib/MesaLib.rshlibs
@@ -7,7 +7,6 @@ libm.so.6
 libgcc_s.so.1
 libstdc++.so.6
 libdrm_intel.so.1
-libdrm_nouveau.so.1
 libdrm_radeon.so.1
 libXfixes.so.3
 libXext.so.6
diff --git a/srcpkgs/MesaLib/libEGL.rshlibs b/srcpkgs/MesaLib/libEGL.rshlibs
index 0ed02d09407..b069f4456f3 100644
--- a/srcpkgs/MesaLib/libEGL.rshlibs
+++ b/srcpkgs/MesaLib/libEGL.rshlibs
@@ -10,7 +10,6 @@ libc.so.6
 libOpenVG.so.1
 libXext.so.6
 libXfixes.so.3
-libdrm_nouveau.so.1
 libglapi.so.0
 libm.so.6
 libudev.so.0
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index a0bcb1b9bf9..f9998f05d42 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,20 +1,20 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
-version=8.0.2
-revision=1
+version=8.0.3
 wrksrc="Mesa-${version}"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
---enable-shared-dricore --enable-gles1 --enable-gles2 --enable-openvg --enable-xa
---enable-egl --with-dri-driverdir=/usr/lib/xorg/modules/dri --with-driver=dri
+--enable-shared-dricore --enable-gles1 --enable-gles2 --enable-openvg
+--enable-egl --with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-xa
 --enable-gallium-egl --disable-va --enable-vdpau --enable-xvmc --enable-xa
---enable-texture-float --with-gallium-drivers=r300,r600,nouveau,swrast,i915,svga"
+--enable-texture-float --with-gallium-drivers=i915,r300,r600,svga,swrast
+--with-dri-drivers=i915,i965,r200,radeon,swrast"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.mesa3d.org/"
 license="MIT, LGPL-2.1"
-checksum=8f4d1e70e058a65143e618a9daaf45f00fac04ae9464b35a8d9eeeef3fa5e2a5
+checksum=96812c59b0923314914185a2b064eb5245f1228a319c4db94835ce1c84da407f
 long_desc="
  MesaLib is a 3-D graphics library with an API which is very similar to
  that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax
@@ -22,6 +22,7 @@ long_desc="
  Inc. However, the author makes no claim that Mesa is in any way a
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
 
+# XXX reenable nouveau driver when it's updated for libdrm>=2.4.34
 subpackages="libEGL libglapi libGLES libGL libGLU libOpenVG"
 subpackages="${subpackages} ${pkgname}-devel"