diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index b820d65426..0cfd45a6f9 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -1,10 +1,10 @@
 # Template file for 'nvidia'
 
-_desc="NVIDIA drivers for linux"
+_desc="NVIDIA drivers for linux (long-lived series)"
 
 pkgname=nvidia
 version=352.79
-revision=1
+revision=2
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Proprietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -14,7 +14,7 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 depends="nvidia-gtklibs-${version}_${revision} nvidia-dkms-${version}_${revision} pkg-config"
-conflicts="xserver-abi-video>21_1"
+conflicts="catalyst>=0 xserver-abi-video>21_1"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 	_pkg="NVIDIA-Linux-x86-${version}"
@@ -97,9 +97,10 @@ do_install() {
 	ln -sf libnvidia-glsi.so.${version} ${DESTDIR}/usr/lib/libnvidia-glsi.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
+	vbin nvidia-cuda-mps-control
+	vbin nvidia-cuda-mps-server
+	gzip -d nvidia-cuda-mps-control.1.gz
+	vman nvidia-cuda-mps-control.1
 
 	vinstall libcuda.so.${version} 755 usr/lib
 	ln -sf libcuda.so.${version} ${DESTDIR}/usr/lib/libcuda.so
@@ -110,12 +111,14 @@ do_install() {
 	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
+	vbin nvidia-xconfig
+	gzip -d nvidia-xconfig.1.gz
+	vman nvidia-xconfig.1
 
 	# nvidia-settings
-	vinstall nvidia-settings 755 usr/bin
-	vinstall nvidia-settings.1.gz 644 usr/share/man/man1
+	vbin nvidia-settings
+	gzip -d nvidia-settings.1.gz
+	vman nvidia-settings.1
 	vinstall nvidia-settings.desktop 644 usr/share/applications
 	vinstall nvidia-settings.png 644 usr/share/pixmaps
 	sed -e 's:__UTILS_PATH__:/usr/bin:' \
@@ -129,18 +132,28 @@ do_install() {
 	ln -sf libnvidia-gtk2.so.${version} ${DESTDIR}/usr/lib/libnvidia-gtk2.so
 	ln -sf libnvidia-gtk2.so.${version} ${DESTDIR}/usr/lib/libnvidia-gtk2.so.1
 
+	# application profiles (needed by nvidia-settings)
+	vinstall nvidia-application-profiles-${version}-key-documentation 644 usr/share/nvidia
+	vinstall nvidia-application-profiles-${version}-rc 644 usr/share/nvidia
+
 	# nvidia-bug-report
-	vinstall nvidia-bug-report.sh 755 usr/bin nvidia-bug-report
-	vinstall nvidia-debugdump 755 usr/bin
+	vbin nvidia-bug-report.sh nvidia-bug-report
+	vbin nvidia-debugdump
 
 	# nvidia-smi
-	vinstall nvidia-smi 755 usr/bin
-	vinstall nvidia-smi.1.gz 644 usr/share/man/man1
+	vbin nvidia-smi
+	gzip -d nvidia-smi.1.gz
+	vman nvidia-smi.1
 
-	# 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
+	# nvidia-modprobe
+	vinstall nvidia-modprobe 4755 usr/bin
+	gzip -d nvidia-modprobe.1.gz
+	vman nvidia-modprobe.1
+
+	# License and documentation
+	vlicense LICENSE
+	vdoc README.txt README
+	vdoc NVIDIA_Changelog
 
 	# opencl pkg
 	vinstall nvidia.icd 644 etc/OpenCL/vendors
@@ -185,7 +198,7 @@ do_install() {
 }
 
 nvidia-gtklibs_package() {
-	short_desc="${_desc} - GTK libraries"
+	short_desc="${_desc} - GTK+ libraries"
 	pkg_install() {
 		vmove usr/lib/lib*gtk*.so*
 	}
diff --git a/srcpkgs/nvidia/update b/srcpkgs/nvidia/update
index faadbf9816..435438d051 100644
--- a/srcpkgs/nvidia/update
+++ b/srcpkgs/nvidia/update
@@ -1,2 +1,2 @@
 site="http://www.nvidia.com/object/unix.html"
-pattern='Short Lived.+>\K[\d.]+(?=</A>)'
+pattern='Long Lived.+>\K[\d.]+(?=</A>)'