diff --git a/srcpkgs/nvidia304/INSTALL b/srcpkgs/nvidia304/INSTALL
deleted file mode 100644
index 5765f6c7782..00000000000
--- a/srcpkgs/nvidia304/INSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-# Overwrite libGL and libglx symlinks.
-case ${ACTION} in
-post)
-	rm -f usr/lib/libGL.so usr/lib/libGL.so.1
-	rm -f usr/lib/xorg/modules/extensions/libglx.so
-
-	# libGL	
-	cd usr/lib
-	ln -sf libGL-nvidia.so.${VERSION%_*} libGL.so
-	ln -sf libGL-nvidia.so.${VERSION%_*} libGL.so.1
-
-	# libglx
-	cd ../../usr/lib/xorg/modules/extensions
-	ln -sf libglx-nvidia.so.${VERSION%_*} libglx.so
-	;;
-esac
diff --git a/srcpkgs/nvidia304/REMOVE b/srcpkgs/nvidia304/REMOVE
deleted file mode 100644
index 83e7efc8e57..00000000000
--- a/srcpkgs/nvidia304/REMOVE
+++ /dev/null
@@ -1,19 +0,0 @@
-# Restore mesa libGL and xorg-server libglx symlinks.
-case ${ACTION} in
-purge)
-	rm -f usr/lib/libGL.so usr/lib/libGL.so.1
-	rm -f usr/lib/xorg/modules/extensions/libglx.so
-
-	# libGL
-	cd usr/lib
-	if [ -f libGL-mesa.so.1.2.0 ]; then
-		ln -sf libGL-mesa.so.1.2.0 libGL.so
-		ln -sf libGL-mesa.so.1.2.0 libGL.so.1
-	fi
-	# libglx
-	if [ -f xorg/modules/extensions/libglx-xorg.so ]; then
-		cd xorg/modules/extensions
-		ln -sf libglx-xorg.so libglx.so
-	fi
-	;;
-esac
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index d223b2ac4e1..21e5262b6d9 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -3,7 +3,7 @@ _desc="NVIDIA drivers for linux (304.xx series)"
 
 pkgname=nvidia304
 version=304.119
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -13,11 +13,11 @@ create_wrksrc=yes
 only_for_archs="i686 x86_64"
 short_desc="${_desc} - Libraries and Utilities"
 depends="xserver-abi-video<16 ${pkgname}-dkms-${version}_${revision} pkg-config"
-provides="nvidia-${version}_${revision}"
-replaces="nvidia>=0"
+provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
+replaces="nvidia>=0 libGL>=0"
 conflicts="catalyst>=0"
 
-if [ "${XBPS_MACHINE}" = "i686" ]; then
+if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="ftp://download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
 	checksum=c8ae388fcf2fa8df41620466b359ce2c51d3f061aaee0df588fc7a9dae80df51
@@ -28,7 +28,7 @@ else
 fi
 
 do_extract() {
-	install -m755 ${XBPS_SRCDISTDIR}/${_pkg}.run ${wrksrc}
+	install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
 	cd ${wrksrc}
 	./${_pkg}.run --extract-only
 	rm -f ${_pkg}.run
@@ -41,11 +41,14 @@ do_install() {
 	vinstall nvidia_drv.so 755 usr/lib/xorg/modules/drivers
 
 	# GLX extension module for X
-	vinstall libglx.so.${version} 755 usr/lib/xorg/modules/extensions \
-		libglx-nvidia.so.${version}
+	vinstall libglx.so.${version} 755 usr/lib/xorg/modules/extensions
+	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
+	ln -sf libglx.so.${version} ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so.1
 
 	# OpenGL library
-	vinstall libGL.so.${version} 755 usr/lib libGL-nvidia.so.${version}
+	vinstall libGL.so.${version} 755 usr/lib
+	ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so
+	ln -sf libGL.so.${version} ${DESTDIR}/usr/lib/libGL.so.1
 
 	# OpenGL core library
 	vinstall libnvidia-glcore.so.${version} 755 usr/lib