--- b/x11/linux-nvidia-libs/Makefile	
+++ b/x11/linux-nvidia-libs/Makefile	
@@ -1,5 +1,5 @@ 
 PORTNAME=	nvidia-libs
-DISTVERSION?=	460.84
+DISTVERSION?=	470.57.02
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 linux
--- b/x11/linux-nvidia-libs/distinfo	
+++ b/x11/linux-nvidia-libs/distinfo	
@@ -1,6 +1,6 @@ 
-TIMESTAMP = 1620395714
-SHA256 (NVIDIA-Linux-x86_64-460.84.run) = a10d2171d6b2c55f63791f58264f9e92829ee4b2779b9b1d011274e63b46b960
-SIZE (NVIDIA-Linux-x86_64-460.84.run) = 177840337
+TIMESTAMP = 1627571308
+SHA256 (NVIDIA-Linux-x86_64-470.57.02.run) = 55d7ae104827faa79e975321fe2b60f9dd42fbff65642053443c0e56fdb4c47d
+SIZE (NVIDIA-Linux-x86_64-470.57.02.run) = 273219658
 SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
 SIZE (NVIDIA-Linux-x86_64-390.144.run) = 85000417
 SHA256 (NVIDIA-Linux-x86-390.144.run) = fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
--- b/x11/nvidia-driver/Makefile	
+++ b/x11/nvidia-driver/Makefile	
@@ -14,7 +14,7 @@ 
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
-DISTVERSION?=	460.84
+DISTVERSION?=	470.57.02
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
@@ -44,9 +44,13 @@ USE_LDCONFIG=	yes
 
 GLVND_JSON_PATH=	${PREFIX}/share/glvnd/egl_vendor.d
 WAYLAND_JSON_PATH=	${PREFIX}/share/egl/egl_external_platform.d
+VKICD_PATH=		${PREFIX}/share/vulkan/icd.d
+VKLAYERS_PATH=		${PREFIX}/share/vulkan/implicit_layer.d
 MAKE_ENV=	DEBUG_FLAGS=${DEBUG_FLAGS} \
 		EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \
-		EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH}
+		EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH} \
+		VKICD_PATH=${STAGEDIR}${VKICD_PATH} \
+		VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH}
 SUB_FILES=	pkg-message
 .if !defined(LIBGLDIR)
 SUB_FILES+=	nvidia.conf
@@ -82,8 +86,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebs
 SUB_PATCHES+=	extra-patch-src-nvidia_ctl.c \
 		extra-patch-src-nvidia_linux.c
 .else
-EXTRA_PATCHES+=	${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \
-		${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
+EXTRA_PATCHES+=	${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \
 		${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \
 		${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
 .endif
--- b/x11/nvidia-driver/distinfo	
+++ b/x11/nvidia-driver/distinfo	
@@ -1,6 +1,6 @@ 
-TIMESTAMP = 1620395718
-SHA256 (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 920cca0df1bf3eedcc2dbe8fca1711b3ab0e09b7864e0bbc990dfd7d35bde0e8
-SIZE (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 108291070
+TIMESTAMP = 1627570406
+SHA256 (NVIDIA-FreeBSD-x86_64-470.57.02.tar.xz) = 1803b39ed3a9f185c6a4528181917af4a56610acfedccc98df0d60d2e498e8f2
+SIZE (NVIDIA-FreeBSD-x86_64-470.57.02.tar.xz) = 99335120
 SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd
 SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942
 SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b
--- a/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile	
+++ /dev/null	
@@ -1,27 +0,0 @@ 
---- lib/libGLX_nvidia/Makefile.orig
-+++ lib/libGLX_nvidia/Makefile
-@@ -16,18 +16,18 @@ EXTRADEPS=	nvidia-application-profiles-rc nvidia_icd.j
- # look for this file.
- 
- nvidia_icd.json:
--	@mkdir -p ${VKICD_PATH}
-+	@mkdir -p ${DESTDIR}${VKICD_PATH}
- 	@${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 		${NVIDIA_ROOT}/nvidia_icd.json \
--		${VKICD_PATH}
--	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKICD_PATH}/nvidia_icd.json
-+		${DESTDIR}${VKICD_PATH}
-+	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKICD_PATH}/nvidia_icd.json
- 
- nvidia_layers.json:
--	@mkdir -p ${VKLAYERS_PATH}
-+	@mkdir -p ${DESTDIR}${VKLAYERS_PATH}
- 	@${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 		${NVIDIA_ROOT}/nvidia_layers.json \
--		${VKLAYERS_PATH}
--	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKLAYERS_PATH}/nvidia_layers.json
-+		${DESTDIR}${VKLAYERS_PATH}
-+	@sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKLAYERS_PATH}/nvidia_layers.json
- 
- 
- nvidia-application-profiles-rc: