diff --git a/srcpkgs/nvidia-opencl b/srcpkgs/nvidia-opencl
new file mode 120000
index 0000000000..746a30838a
--- /dev/null
+++ b/srcpkgs/nvidia-opencl
@@ -0,0 +1 @@
+nvidia
\ No newline at end of file
diff --git a/srcpkgs/nvidia/nvidia-dkms.template b/srcpkgs/nvidia/nvidia-dkms.template
index 07df60eeac..17e62c4ac6 100644
--- a/srcpkgs/nvidia/nvidia-dkms.template
+++ b/srcpkgs/nvidia/nvidia-dkms.template
@@ -1,9 +1,8 @@
 # Template file for 'nvidia-dkms'.
 #
-short_desc="${short_desc} -- DKMS kernel module"
-long_desc="${long_desc}
-
- This package contains the kernel module files for DKMS."
+short_desc="NVIDIA non free driver -- DKMS kernel module"
+long_desc="
+ This package contains the NVIDIA non free kernel module files for DKMS."
 
 nonfree=yes
 triggers="dkms"
diff --git a/srcpkgs/nvidia/nvidia-opencl.rshlibs b/srcpkgs/nvidia/nvidia-opencl.rshlibs
new file mode 100644
index 0000000000..0543e8fdc4
--- /dev/null
+++ b/srcpkgs/nvidia/nvidia-opencl.rshlibs
@@ -0,0 +1,7 @@
+libpthread.so.0
+libz.so.1
+libdl.so.2
+libm.so.6
+librt.so.1
+libc.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/nvidia/nvidia-opencl.template b/srcpkgs/nvidia/nvidia-opencl.template
new file mode 100644
index 0000000000..7f994b2e99
--- /dev/null
+++ b/srcpkgs/nvidia/nvidia-opencl.template
@@ -0,0 +1,31 @@
+# Template file for 'nvidia-opencl'.
+#
+short_desc="NVIDIA non free driver -- OpenCL implementation"
+long_desc="
+ This package contains the NVIDIA non free OpenCL implementation."
+
+nonfree=yes
+provides="libOpenCL-${version}"
+replaces="libOpenCL>=0"
+
+do_install() {
+	cd ${_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
+}
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 34947b6053..491ba8c4aa 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -1,19 +1,20 @@
 # Template file for 'nvidia'
 pkgname=nvidia
 version=310.19
-revision=1
-short_desc="NVIDIA drivers for linux"
+revision=2
+short_desc="NVIDIA drivers for linux -- libraries and utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
 long_desc="
- This package contains the non free NVIDIA Binary drivers for the Linux kernel."
+ This package contains the non free NVIDIA libraries and utilities for
+ the propietary NVIDIA driver for the Linux kernel."
 
 create_wrksrc=yes
 noextract=yes
 nostrip=yes
 nonfree=yes
-subpackages="nvidia-dkms"
+subpackages="nvidia-dkms nvidia-opencl"
 depends="nvidia-dkms-${version}_${revision}"
 
 if [ "${XBPS_MACHINE}" = "i686" ]; then