diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 23efd76bbbda..463f9a9e60a6 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,9 +14,9 @@
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
-DISTVERSION?=	460.80
+DISTVERSION?=	460.84
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -36,6 +36,9 @@ BUILD_DEPENDS=	pkg-config:devel/pkgconf libglvnd>0:graphics/libglvnd
 .endif
 
 USES=		kmod uidfix xorg
+.if ${NVVERSION} >= 470.04201
+USES+=		tar:xz
+.endif
 USE_XORG=	x11 xorg-server xext
 USE_LDCONFIG=	yes
 
@@ -53,7 +56,6 @@ SUB_FILES+=	pkg-deinstall pkg-install
 .endif
 SUB_PATCHES=	extra-patch-src-Makefile \
 		extra-patch-src-nv-freebsd.h \
-		extra-patch-src-nv-misc.h \
 		extra-patch-src-nvidia_dev.c \
 		extra-patch-src-nvidia_pci.c
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
@@ -85,6 +87,9 @@ EXTRA_PATCHES+=	${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \
 		${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \
 		${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c
 .endif
+.if ${NVVERSION} < 470.04201
+SUB_PATCHES+=	extra-patch-src-nv-misc.h
+.endif
 
 OPTIONS_DEFINE=	ACPI_PM LINUX WBINVD DOCS
 OPTIONS_DEFINE_i386=	PAE
@@ -242,7 +247,7 @@ post-install: .SILENT
 	${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \
 		${STAGEDIR}${PREFIX}/bin
 # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's
-.if ${NVVERSION:R} < 460
+.if ${NVVERSION} < 460.039
 	${REINPLACE_CMD} -e '/libnvidia-glvkspirv\.so/d ; \
 		/nvidia_icd\.json/d ; /nvidia_layers\.json/d' ${TMPPLIST}
 .endif
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 20ecec19cccb..fe29aa46d4e6 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,10 +1,8 @@
-TIMESTAMP = 1620395718
-SHA256 (NVIDIA-FreeBSD-x86_64-460.80.tar.gz) = 9f8d99b5da2ed5eccea420b78d6c3cf26d28c67e7d4e724ad2659d28f4d5085e
-SIZE (NVIDIA-FreeBSD-x86_64-460.80.tar.gz) = 108266521
-TIMESTAMP = 1621509436
+TIMESTAMP = 1624975053
+SHA256 (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 920cca0df1bf3eedcc2dbe8fca1711b3ab0e09b7864e0bbc990dfd7d35bde0e8
+SIZE (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 108291070
 SHA256 (NVIDIA-FreeBSD-x86_64-390.143.tar.gz) = 2727e6d9a804bdfb24651db0483e5783cf871209a614e29626d4f0489a5342a3
 SIZE (NVIDIA-FreeBSD-x86_64-390.143.tar.gz) = 65303039
-TIMESTAMP = 1621509441
 SHA256 (NVIDIA-FreeBSD-x86-390.143.tar.gz) = 918d4d04a492933a20b2f646790a05fd16dc540c01fe495290ccedf3eecb0566
 SIZE (NVIDIA-FreeBSD-x86-390.143.tar.gz) = 65965455
 SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f