diff --git a/common/shlibs b/common/shlibs
index 22312429f9c..d3646f5607e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -139,7 +139,7 @@ libnvidia-gtk2.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore
 libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore
 libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore
-libnvidia-fatbinaryloader.so.381.22 nvidia-libs-381.22_1 ignore
+libnvidia-fatbinaryloader.so.384.59 nvidia-libs-384.59_1 ignore
 libglapi.so.0 libglapi-7.11_1
 libgbm.so.1 libgbm-9.0_1
 librsvg-2.so.2 librsvg-2.26.0_1
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 5c2bc4440ad..39dabdbae5b 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux (long-lived series)"
 
 pkgname=nvidia
-version=381.22
-revision=2
+version=384.59
+revision=1
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -24,11 +24,11 @@ build_options_default="glvnd"
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run"
-	checksum=7b7dd6ee1c871dc5367fc207bba65077c3820a683decbfe6126fc70c0d1b9d08
+	checksum=0c17658a4f874df43c02b521cd0a1357dfe2ea0b553be6b47ebae2e45323916c
 else
 	_pkg="NVIDIA-Linux-x86_64-${version}-no-compat32"
 	distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-	checksum=c2468130af124bfe748bdf2bc4c08952a81b35d2bdb87d1217717e6a576217e8
+	checksum=2d03e687b6b77d072de057349fceb0b7b19a4387d610ea22928ce99d2945d165
 fi
 
 subpackages="nvidia-gtklibs nvidia-dkms nvidia-opencl nvidia-libs"
@@ -39,6 +39,13 @@ do_extract() {
 	./${_pkg}.run --extract-only
 	rm -f ${_pkg}.run
 }
+
+pre_install() {
+	cd ${_pkg}
+	cp nvidia_icd.json.template nvidia_icd.json
+	sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json
+}
+
 do_install() {
 	cd ${_pkg}