diff --git a/srcpkgs/MesaLib/libGL.INSTALL b/srcpkgs/MesaLib/libGL.INSTALL
index fadefb5d96..f74fc7c550 100644
--- a/srcpkgs/MesaLib/libGL.INSTALL
+++ b/srcpkgs/MesaLib/libGL.INSTALL
@@ -1,9 +1,11 @@
 # Create libGL.so symlinks.
 case ${ACTION} in
 post)
-	rm -f usr/lib/libGL.so usr/lib/libGL.so.1
-	cd usr/lib
-	ln -sf libGL-mesa.so* libGL.so
-	ln -sf libGL-mesa.so* libGL.so.1
+	if [ ! -e usr/lib/libGL-nvidia.so* ]; then
+		rm -f usr/lib/libGL.so usr/lib/libGL.so.1
+		cd usr/lib
+		ln -sf libGL-mesa.so* libGL.so
+		ln -sf libGL-mesa.so* libGL.so.1
+	fi
 	;;
 esac
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 505a6ba644..9207a4a63c 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=8.0.4
-revision=4
+revision=5
 wrksrc="Mesa-${version}"
 build_style=gnu-configure
 configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl