diff --git a/srcpkgs/nvidia331-dkms b/srcpkgs/nvidia331-dkms
new file mode 120000
index 00000000000..bcf57d4d716
--- /dev/null
+++ b/srcpkgs/nvidia331-dkms
@@ -0,0 +1 @@
+nvidia331
\ No newline at end of file
diff --git a/srcpkgs/nvidia331-opencl b/srcpkgs/nvidia331-opencl
new file mode 120000
index 00000000000..bcf57d4d716
--- /dev/null
+++ b/srcpkgs/nvidia331-opencl
@@ -0,0 +1 @@
+nvidia331
\ No newline at end of file
diff --git a/srcpkgs/nvidia331/nvidia331-dkms.INSTALL b/srcpkgs/nvidia331/nvidia331-dkms.INSTALL
new file mode 100644
index 00000000000..51795d79e05
--- /dev/null
+++ b/srcpkgs/nvidia331/nvidia331-dkms.INSTALL
@@ -0,0 +1,7 @@
+# Regenerate initramfs.
+case ${ACTION} in
+post)
+	echo "Regenerating initramfs, please wait..."
+	dracut -f -q
+	;;
+esac
diff --git a/srcpkgs/nvidia331/nvidia331-dkms.REMOVE b/srcpkgs/nvidia331/nvidia331-dkms.REMOVE
new file mode 100644
index 00000000000..c975fe02286
--- /dev/null
+++ b/srcpkgs/nvidia331/nvidia331-dkms.REMOVE
@@ -0,0 +1,7 @@
+# Regenerate initramfs.
+case ${ACTION} in
+purge)
+	echo "Regenerating initramfs, please wait..."
+	dracut -f -q
+	;;
+esac
diff --git a/srcpkgs/nvidia331/template b/srcpkgs/nvidia331/template
new file mode 100644
index 00000000000..e143c9e825d
--- /dev/null
+++ b/srcpkgs/nvidia331/template
@@ -0,0 +1,187 @@
+# Template file for 'nvidia'
+
+_desc="NVIDIA drivers for linux (331.x series)"
+
+pkgname=nvidia331
+version=331.67
+revision=1
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Propietary NVIDIA license"
+homepage="http://www.nvidia.com"
+
+only_for_archs="i686 x86_64"
+nonfree=yes
+create_wrksrc=yes
+short_desc="${_desc} - Libraries and Utilities"
+depends="xserver-abi-video<16 nvidia331-dkms-${version}_${revision} pkg-config"
+conflicts="catalyst>=0"
+
+provides="nvidia-${version}_${revision} libGL-${version}_${revision}"
+replaces="nvidia>=0 libGL>=0"
+
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	_pkg="NVIDIA-Linux-x86-${version}"
+	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"
+	checksum=696b4a574ad3cb2b3286e0848e7e831940110cc33c63de51890154dbbd31acc6
+else
+	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
+	distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}-no-compat32.run"
+	checksum=87b882ac9d9f51ac47eb718f47dee3a62752ac9be1b893b8c9acfa229a24ad63
+fi
+
+do_extract() {
+	install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
+	cd ${wrksrc}
+	./${_pkg}.run --extract-only
+	rm -f ${_pkg}.run
+}
+
+do_install() {
+	cd ${_pkg}
+
+	# X driver
+	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
+	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
+	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
+	ln -sf libnvidia-glcore.so.${version} ${DESTDIR}/usr/lib/libnvidia-glcore.so
+
+	# VDPAU
+	vinstall libvdpau_nvidia.so.${version} 755 usr/lib/vdpau
+	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so
+	ln -sf libvdpau_nvidia.so.${version} ${DESTDIR}/usr/lib/vdpau/libvdpau_nvidia.so.1
+
+	# misc libraries
+	vinstall tls/libnvidia-tls.so.${version} 755 usr/lib
+	ln -sf libnvidia-tls.so.${version} ${DESTDIR}/usr/lib/libnvidia-tls.so
+
+	vinstall libnvidia-cfg.so.${version} 755 usr/lib
+	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so
+	ln -sf libnvidia-cfg.so.${version} ${DESTDIR}/usr/lib/libnvidia-cfg.so.1
+
+	vinstall libnvidia-ml.so.${version} 755 usr/lib
+	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so
+	ln -sf libnvidia-ml.so.${version} ${DESTDIR}/usr/lib/libnvidia-ml.so.1
+
+	vinstall libnvidia-encode.so.${version} 755 usr/lib
+	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so
+	ln -sf libnvidia-encode.so.${version} ${DESTDIR}/usr/lib/libnvidia-encode.so.1
+
+	vinstall libnvidia-ifr.so.${version} 755 usr/lib
+	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so
+	ln -sf libnvidia-ifr.so.${version} ${DESTDIR}/usr/lib/libnvidia-ifr.so.1
+
+	vinstall libnvidia-fbc.so.${version} 755 usr/lib
+	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so
+	ln -sf libnvidia-fbc.so.${version} ${DESTDIR}/usr/lib/libnvidia-fbc.so.1
+
+	# CUDA
+	vinstall nvidia-cuda-mps-control 755 usr/bin
+	vinstall nvidia-cuda-mps-server 755 usr/bin
+	vinstall nvidia-cuda-mps-control.1.gz 644 usr/share/man/man1
+
+	vinstall libcuda.so.${version} 755 usr/lib
+	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so
+	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so.1
+
+	vinstall libnvcuvid.so.${version} 755 usr/lib
+	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so
+	ln -sf libnvcuvid.so.${version} ${DESTDIR}/usr/lib/libnvcuvid.so.1
+
+	# nvidia-xconfig
+	vinstall nvidia-xconfig 755 usr/bin
+	vinstall nvidia-xconfig.1.gz 644 usr/share/man/man1
+
+	# nvidia-settings
+	vinstall nvidia-settings 755 usr/bin
+	vinstall nvidia-settings.1.gz 644 usr/share/man/man1
+	vinstall nvidia-settings.desktop 644 usr/share/applications
+	vinstall nvidia-settings.png 644 usr/share/pixmaps
+	sed -e 's:__UTILS_PATH__:/usr/bin:' \
+		-e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+		-i ${DESTDIR}/usr/share/applications/nvidia-settings.desktop
+
+	# nvidia-bug-report
+	vinstall nvidia-bug-report.sh 755 usr/bin nvidia-bug-report
+	vinstall nvidia-debugdump 755 usr/bin
+
+	# nvidia-smi
+	vinstall nvidia-smi 755 usr/bin
+	vinstall nvidia-smi.1.gz 644 usr/share/man/man1
+
+	# License and documentation.
+	vinstall LICENSE 644 usr/share/licenses/nvidia
+	vinstall README.txt 644 usr/share/doc/nvidia README
+	vinstall NVIDIA_Changelog 644 usr/share/doc/nvidia
+
+	# opencl pkg
+	vinstall nvidia.icd 644 etc/OpenCL/vendors
+
+	vinstall libOpenCL.so.1.0.0 755 usr/lib
+	ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so
+	ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so.1
+
+	vinstall libnvidia-compiler.so.${version} 755 usr/lib
+	ln -sf libnvidia-compiler.so.${version} \
+		${DESTDIR}/usr/lib/libnvidia-compiler.so
+	ln -sf libnvidia-compiler.so.${version} \
+		${DESTDIR}/usr/lib/libnvidia-compiler.so.1
+
+	vinstall libnvidia-opencl.so.${version} 755 usr/lib
+	ln -sf libnvidia-opencl.so.${version} \
+		${DESTDIR}/usr/lib/libnvidia-opencl.so
+	ln -sf libnvidia-opencl.so.${version} \
+		${DESTDIR}/usr/lib/libnvidia-opencl.so.1
+
+	# dkms pkg
+	vmkdir usr/src/nvidia-${version}
+	vcopy "kernel/*" usr/src/nvidia-${version}
+
+	# systemd modules-load.d(5) file.
+	vmkdir usr/lib/modules-load.d
+	echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
+	chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf
+
+	# Blacklist nouveau.
+	vmkdir usr/lib/modprobe.d
+	echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
+	chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf
+}
+
+nvidia331-dkms_package() {
+	short_desc="${_desc} - DKMS kernel module"
+	triggers="dkms"
+	dkms_modules="nvidia ${version}"
+	depends="dkms"
+	provides="nvidia-dkms-${version}_${revision}"
+	replaces="nvidia-dkms>=0"
+	nonfree=yes
+	pkg_install() {
+		vmove usr/src
+		vmove usr/lib/modules-load.d
+		vmove usr/lib/modprobe.d
+	}
+}
+
+nvidia331-opencl_package() {
+	short_desc="${_desc} - OpenCL implementation"
+	provides="nvidia-opencl-${version}_${revision} libOpenCL-${version}_${revision}"
+	replaces="nvidia-opencl>=0 libOpenCL>=0"
+	nonfree=yes
+	pkg_install() {
+		vmove "usr/lib/libOpenCL*"
+		vmove "usr/lib/libnvidia-compiler*"
+		vmove "usr/lib/libnvidia-opencl*"
+		vmove etc/OpenCL
+	}
+}