diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile
index fc5f1f0fbdc2..0766514f6d54 100644
--- a/graphics/nvidia-drm-515-kmod/Makefile
+++ b/graphics/nvidia-drm-515-kmod/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	nvidia-drm-515-kmod
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-515-kmod
 CONFLICTS_INSTALL=	nvidia-drm-61-kmod* nvidia-drm-66-kmod* nvidia-drm-612-kmod* nvidia-drm-latest-kmod*
 
 .include "${.CURDIR}/../drm-515-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 
 .include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo
index c6e97239dc1b..f679de8aa477 100644
--- a/graphics/nvidia-drm-515-kmod/distinfo
+++ b/graphics/nvidia-drm-515-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340155
-SHA256 (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = bfebb91c22433e18a54027dc067dcc0bbf56bfba421b76122001836719f1e336
-SIZE (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = 328342032
+TIMESTAMP = 1781705115
+SHA256 (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 9407449b9c140497b36f0928912295f5c9e48afc385d940d511b200796d2b8c2
+SIZE (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 328196032
 SHA256 (freebsd-drm-kmod-drm_v5.15.160_7_GH0.tar.gz) = e0dd79e59906174b88144ca367b3377c048953835320375f2fc722283c0d63f5
 SIZE (freebsd-drm-kmod-drm_v5.15.160_7_GH0.tar.gz) = 26100564
diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile
index 0ff6e9ca78d2..8f941b48148d 100644
--- a/graphics/nvidia-drm-61-kmod/Makefile
+++ b/graphics/nvidia-drm-61-kmod/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	nvidia-drm-61-kmod
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-61-kmod
 CONFLICTS_INSTALL=	nvidia-drm-515-kmod* nvidia-drm-66-kmod* nvidia-drm-612-kmod* nvidia-drm-latest-kmod*
 
 .include "${.CURDIR}/../drm-61-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 
 .include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo
index 891c268f465f..bd21c92b8272 100644
--- a/graphics/nvidia-drm-61-kmod/distinfo
+++ b/graphics/nvidia-drm-61-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340059
-SHA256 (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = bfebb91c22433e18a54027dc067dcc0bbf56bfba421b76122001836719f1e336
-SIZE (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = 328342032
+TIMESTAMP = 1781705285
+SHA256 (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 9407449b9c140497b36f0928912295f5c9e48afc385d940d511b200796d2b8c2
+SIZE (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 328196032
 SHA256 (freebsd-drm-kmod-drm_v6.1.128_11_GH0.tar.gz) = bbe913b9d3c8cb1ae4f397e1d9a3e52324efa117aef58953df1ef5032cae7546
 SIZE (freebsd-drm-kmod-drm_v6.1.128_11_GH0.tar.gz) = 37111640
diff --git a/graphics/nvidia-drm-612-kmod/Makefile b/graphics/nvidia-drm-612-kmod/Makefile
index daae7c7620d9..1467c5ad5ed4 100644
--- a/graphics/nvidia-drm-612-kmod/Makefile
+++ b/graphics/nvidia-drm-612-kmod/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	nvidia-drm-612-kmod
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-612-kmod
 CONFLICTS_INSTALL=	nvidia-drm-515-kmod* nvidia-drm-61-kmod* nvidia-drm-66-kmod* nvidia-drm-latest-kmod*
 
 .include "${.CURDIR}/../drm-612-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 
 .include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-612-kmod/distinfo b/graphics/nvidia-drm-612-kmod/distinfo
index 5ddc00b2485a..ee129df05aed 100644
--- a/graphics/nvidia-drm-612-kmod/distinfo
+++ b/graphics/nvidia-drm-612-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340172
-SHA256 (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = bfebb91c22433e18a54027dc067dcc0bbf56bfba421b76122001836719f1e336
-SIZE (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = 328342032
+TIMESTAMP = 1781705778
+SHA256 (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 9407449b9c140497b36f0928912295f5c9e48afc385d940d511b200796d2b8c2
+SIZE (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 328196032
 SHA256 (freebsd-drm-kmod-drm_v6.12.85_2_GH0.tar.gz) = 27788fcbb9976f10fa6965dfc0096b705e140131a69960452027624b3d7613af
 SIZE (freebsd-drm-kmod-drm_v6.12.85_2_GH0.tar.gz) = 44076407
diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile
index 55a9e2aaef7a..f9149f513ad0 100644
--- a/graphics/nvidia-drm-66-kmod/Makefile
+++ b/graphics/nvidia-drm-66-kmod/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	nvidia-drm-66-kmod
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-66-kmod
 CONFLICTS_INSTALL=	nvidia-drm-515-kmod* nvidia-drm-61-kmod* nvidia-drm-612-kmod* nvidia-drm-latest-kmod*
 
 .include "${.CURDIR}/../drm-66-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 
 .include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo
index 7394c9a64b21..b295c24f6250 100644
--- a/graphics/nvidia-drm-66-kmod/distinfo
+++ b/graphics/nvidia-drm-66-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340142
-SHA256 (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = bfebb91c22433e18a54027dc067dcc0bbf56bfba421b76122001836719f1e336
-SIZE (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = 328342032
+TIMESTAMP = 1781705541
+SHA256 (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 9407449b9c140497b36f0928912295f5c9e48afc385d940d511b200796d2b8c2
+SIZE (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 328196032
 SHA256 (freebsd-drm-kmod-drm_v6.6.25_13_GH0.tar.gz) = c6cd8fd735786dc02b044ff6605a09bf1932602274a45b6a253f94255c6a3109
 SIZE (freebsd-drm-kmod-drm_v6.6.25_13_GH0.tar.gz) = 38489347
diff --git a/graphics/nvidia-drm-latest-kmod/distinfo b/graphics/nvidia-drm-latest-kmod/distinfo
index ad6797533569..124bf9162eb8 100644
--- a/graphics/nvidia-drm-latest-kmod/distinfo
+++ b/graphics/nvidia-drm-latest-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780128496
-SHA256 (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = bfebb91c22433e18a54027dc067dcc0bbf56bfba421b76122001836719f1e336
-SIZE (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = 328342032
+TIMESTAMP = 1781705934
+SHA256 (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 9407449b9c140497b36f0928912295f5c9e48afc385d940d511b200796d2b8c2
+SIZE (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 328196032
 SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df
 SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index 0f514ac764ab..43845ae87b26 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1780127133
-SHA256 (NVIDIA-Linux-x86_64-595.80.run) = 3d54c83fe07fd3573ff0ceba8574c06132e0f53d87cbdbb582ae372bb4c5d478
-SIZE (NVIDIA-Linux-x86_64-595.80.run) = 423049323
+TIMESTAMP = 1781704722
+SHA256 (NVIDIA-Linux-x86_64-595.84.run) = 99c404e52131bf27bca6da0268dcce3ebedc7a73ab174071a995cf1a6c5eba06
+SIZE (NVIDIA-Linux-x86_64-595.84.run) = 423524924
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index e0bfe48a0402..9fed49eb21a5 100644
--- a/x11/nvidia-driver/Makefile.version
+++ b/x11/nvidia-driver/Makefile.version
@@ -1,4 +1,4 @@
 # NVIDIA Distversion
 #
 # This will be included from x11/nvidia-driver and the nvidia-drm port
-NVIDIA_DISTVERSION?= 595.80
+NVIDIA_DISTVERSION?= 595.84
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 6b62ae6b82e6..416a8a9ae222 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1780126777
-SHA256 (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = bfebb91c22433e18a54027dc067dcc0bbf56bfba421b76122001836719f1e336
-SIZE (NVIDIA-FreeBSD-x86_64-595.80.tar.xz) = 328342032
+TIMESTAMP = 1781704221
+SHA256 (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 9407449b9c140497b36f0928912295f5c9e48afc385d940d511b200796d2b8c2
+SIZE (NVIDIA-FreeBSD-x86_64-595.84.tar.xz) = 328196032
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 5c5ccfda127d..e94cce804b18 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	nvidia-settings
-PORTVERSION=	595.80
+PORTVERSION=	595.84
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Display Control Panel for NVIDIA graphics
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	Nvidia driver is only available on x86
 
 BUILD_DEPENDS=	${LOCALBASE}/include/dbus-1.0/dbus/dbus.h:devel/dbus \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjansson.so:devel/jansson \
 		libvdpau.so:multimedia/libvdpau
 
 USES=		gl gmake gnome pkgconfig gettext-runtime xorg \
 		desktop-file-utils
 USE_GNOME=	gtk30 cairo gdkpixbuf
 USE_GL=		gl
 USE_XORG=	x11 xext xv xxf86vm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NVIDIA
 
 PLIST_FILES=	bin/nvidia-settings \
 		libexec/nvidia-settings \
 		lib/libnvidia-gtk3.so.${PORTVERSION} \
 		share/applications/nvidia-settings.desktop \
 		share/man/man1/nvidia-settings.1.gz \
 		share/pixmaps/nvidia-settings.png
 
 SUB_FILES=	nvidia-settings
 
 LDFLAGS+=	-pthread
 LLD_UNSAFE=	yes
 MAKE_ENV=	NV_USE_BUNDLED_LIBJANSSON=0 \
 		NV_VERBOSE=1 \
 		GTK2_AVAILABLE=0 \
 		INSTALL_DOC_ARGS="${INSTALL_MAN:Ninstall}" \
 		XNVCTRL_CFLAGS=-I${LOCALBASE}/include \
 		XNVCTRL_LDFLAGS=-L${LOCALBASE}/lib
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -E -e 's,__(PIXMAP|UTILS)_PATH__/,,' \
 		-e 's|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Settings;HardwareSettings;|' \
 		${WRKSRC}/doc/nvidia-settings.desktop
 	${REINPLACE_CMD} -e 's|/usr/share/nvidia/|${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/|' \
 		${WRKSRC}/src/gtk+-2.x/ctkappprofile.c
 
 post-install:	.SILENT
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnvidia-gtk3.so.${PORTVERSION}
 	${RM} ${STAGEDIR}/${PREFIX}/lib/libnvidia-wayland-client.so.${PORTVERSION}
 	${INSTALL_DATA} ${WRKSRC}/doc/nvidia-settings.desktop \
 		${STAGEDIR}/${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/nvidia-settings.png \
 		${STAGEDIR}/${PREFIX}/share/pixmaps
 	${MV} ${STAGEDIR}${PREFIX}/bin/nvidia-settings \
 		${STAGEDIR}${PREFIX}/libexec/nvidia-settings
 	${INSTALL} ${WRKDIR}/nvidia-settings \
 		${STAGEDIR}${PREFIX}/bin/nvidia-settings
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-settings/distinfo b/x11/nvidia-settings/distinfo
index c5c2cff3a805..bc0d1d0b8c2d 100644
--- a/x11/nvidia-settings/distinfo
+++ b/x11/nvidia-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1779909412
-SHA256 (NVIDIA-nvidia-settings-595.80_GH0.tar.gz) = ec1c8e2a43caf009cc26bd8b7c31383fa8e79c0a2982a5a6a2c655362194cb13
-SIZE (NVIDIA-nvidia-settings-595.80_GH0.tar.gz) = 1327075
+TIMESTAMP = 1781766863
+SHA256 (NVIDIA-nvidia-settings-595.84_GH0.tar.gz) = 7e371fb45e1d07768f90a0f9c0ef852067cc0e5258b61209f260614586ca9f88
+SIZE (NVIDIA-nvidia-settings-595.84_GH0.tar.gz) = 1327049
diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
index d927a0c1e64e..91817ed5c83e 100644
--- a/x11/nvidia-xconfig/Makefile
+++ b/x11/nvidia-xconfig/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	595.80
+PORTVERSION=	595.84
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	NVIDIA graphics X configuration utility
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 USES=		gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	NVIDIA
 
 MAKE_ENV=	NV_VERBOSE=1
 
 PLIST_FILES=	bin/nvidia-xconfig \
 		share/man/man1/nvidia-xconfig.1.gz
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-xconfig/distinfo b/x11/nvidia-xconfig/distinfo
index 8596a907b029..f97b6403f09a 100644
--- a/x11/nvidia-xconfig/distinfo
+++ b/x11/nvidia-xconfig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1779909471
-SHA256 (NVIDIA-nvidia-xconfig-595.80_GH0.tar.gz) = 1b84bd5cb844f0408af4e47cd1ff9fe90ae081db7ecc3646c23438c245c61977
-SIZE (NVIDIA-nvidia-xconfig-595.80_GH0.tar.gz) = 145282
+TIMESTAMP = 1781767231
+SHA256 (NVIDIA-nvidia-xconfig-595.84_GH0.tar.gz) = 677a3b8f08ebeb0c49024f32e3cdf0b8a21f67bb868038ef2c0fcf7ce9e8a105
+SIZE (NVIDIA-nvidia-xconfig-595.84_GH0.tar.gz) = 145286