diff --git a/graphics/nvidia-drm-515-kmod-devel/Makefile b/graphics/nvidia-drm-515-kmod-devel/Makefile
index 26216b54b21f..b20c059aace9 100644
--- a/graphics/nvidia-drm-515-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-515-kmod-devel/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	595.58.03
+NVIDIA_DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-515-kmod
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-515-kmod-devel/distinfo b/graphics/nvidia-drm-515-kmod-devel/distinfo
index 80b97a181ef9..d820b0c8735c 100644
--- a/graphics/nvidia-drm-515-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-515-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1774374181
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777389532
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v5.15.160_6_GH0.tar.gz) = e21962b06c5c4740a165fbb36a1c15107a4c6ccba50ca08df4fb1c9368645ce6
 SIZE (freebsd-drm-kmod-drm_v5.15.160_6_GH0.tar.gz) = 26099109
diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo
index 80b97a181ef9..d820b0c8735c 100644
--- a/graphics/nvidia-drm-515-kmod/distinfo
+++ b/graphics/nvidia-drm-515-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1774374181
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777389532
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v5.15.160_6_GH0.tar.gz) = e21962b06c5c4740a165fbb36a1c15107a4c6ccba50ca08df4fb1c9368645ce6
 SIZE (freebsd-drm-kmod-drm_v5.15.160_6_GH0.tar.gz) = 26099109
diff --git a/graphics/nvidia-drm-61-kmod-devel/Makefile b/graphics/nvidia-drm-61-kmod-devel/Makefile
index 02937f4e768b..197b4cb2c13e 100644
--- a/graphics/nvidia-drm-61-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-61-kmod-devel/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	595.58.03
+NVIDIA_DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	1
+PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-61-kmod
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-61-kmod-devel/distinfo b/graphics/nvidia-drm-61-kmod-devel/distinfo
index 90474dfb5262..f878727198e1 100644
--- a/graphics/nvidia-drm-61-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-61-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777450199
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777453948
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v6.1.128_9_GH0.tar.gz) = 049832794bb3a3411d750f081aa36b8adc72e5040f88e6fb0afcce903aab2134
 SIZE (freebsd-drm-kmod-drm_v6.1.128_9_GH0.tar.gz) = 37106439
diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile
index d5461e5f0823..28680a3436ed 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*
 
 .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 801a81e58502..f878727198e1 100644
--- a/graphics/nvidia-drm-61-kmod/distinfo
+++ b/graphics/nvidia-drm-61-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777450116
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777453948
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v6.1.128_9_GH0.tar.gz) = 049832794bb3a3411d750f081aa36b8adc72e5040f88e6fb0afcce903aab2134
 SIZE (freebsd-drm-kmod-drm_v6.1.128_9_GH0.tar.gz) = 37106439
diff --git a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-freebsd-lkpi.c-20250918-01 b/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01
similarity index 100%
rename from graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-freebsd-lkpi.c-20250918-01
rename to graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01
diff --git a/graphics/nvidia-drm-66-kmod-devel/Makefile b/graphics/nvidia-drm-66-kmod-devel/Makefile
index f88322389f9e..a14471655724 100644
--- a/graphics/nvidia-drm-66-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-66-kmod-devel/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	595.58.03
+NVIDIA_DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	1
+PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-66-kmod
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-66-kmod-devel/distinfo b/graphics/nvidia-drm-66-kmod-devel/distinfo
index f8d1dc20e509..5c84b2cc4561 100644
--- a/graphics/nvidia-drm-66-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-66-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777449715
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777454072
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v6.6.25_10_GH0.tar.gz) = 1633c5e712dd781239b61928d6524a25f7aa18206200b54f20c3f2b5c4f596ff
 SIZE (freebsd-drm-kmod-drm_v6.6.25_10_GH0.tar.gz) = 38488660
diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile
index f023bba7f525..f5af2c65fcbb 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*
 
 .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 9b94c344b817..5c84b2cc4561 100644
--- a/graphics/nvidia-drm-66-kmod/distinfo
+++ b/graphics/nvidia-drm-66-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1777449567
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777454072
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v6.6.25_10_GH0.tar.gz) = 1633c5e712dd781239b61928d6524a25f7aa18206200b54f20c3f2b5c4f596ff
 SIZE (freebsd-drm-kmod-drm_v6.6.25_10_GH0.tar.gz) = 38488660
diff --git a/graphics/nvidia-drm-66-kmod/files/patch-nvidia-drm-freebsd-lkpi.c-20250918-01 b/graphics/nvidia-drm-66-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01
similarity index 100%
rename from graphics/nvidia-drm-66-kmod/files/patch-nvidia-drm-freebsd-lkpi.c-20250918-01
rename to graphics/nvidia-drm-66-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01
diff --git a/graphics/nvidia-drm-kmod-devel/Makefile b/graphics/nvidia-drm-kmod-devel/Makefile
index 22f5d350c11d..d2c6a6e74775 100644
--- a/graphics/nvidia-drm-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-kmod-devel/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	595.58.03
+DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-drm-kmod
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
index e7d8fac4620a..d303d5331bab 100644
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -1,88 +1,92 @@
 # Common rules for nvidia-drm-*-kmod ports
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	NVIDIA DRM Kernel Module
 WWW=		https://www.nvidia.com/object/unix.html
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${NVIDIA_DISTVERSION}:nvidia \
 				https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_GH_TAGNAME}?dummy=/:drm
 DISTVERSION?=   ${NVIDIA_DISTVERSION}
 PORTREVISION?=	0
 DISTFILES=		NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}${EXTRACT_SUFX}:nvidia \
 				freebsd-drm-kmod-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm
 # Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
 # Kept for switching to centralized distinfo with suffixes.
 .ifdef PKGNAMESUFFIX
 DISTINFO_FILE=	${.CURDIR}/distinfo
 .endif
 
 ONLY_FOR_ARCHS=	amd64
 USES=		kmod uidfix tar:xz
 
 SUB_FILES=	20-nvidia-drm-outputclass.conf
 
 RUN_DEPENDS+=	${KMODDIR}/nvidia.ko:x11/nvidia-kmod${PKGNAMESUFFIX}
 
 .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.common"
 
 LICENSE_FILE=	${WRKSRC}/../../doc/license.txt
 
 PLIST_FILES=	${KMODDIR}/nvidia-drm.ko \
 		share/X11/xorg.conf.d/20-nvidia-drm-outputclass.conf
 
 MAKE_ENV+=	DEBUG_FLAGS=${DEBUG_FLAGS} \
 			DRMKMODDIR=${WRKDIR}/drm-kmod-${DRM_KMOD_GH_TAGNAME}/
 WRKSRC=		${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/
 WRKSRC_SUBDIR=	src/nvidia-drm/
 
+.if ${NVVERSION} < 595.07105 && empty(.CURDIR:M*graphics/nvidia-drm-5*)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01
+.endif
+
 .if ${NVVERSION} < 565.00000
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-conftest.h
 .endif #565.00
 
 .if ${NVVERSION} < 555.04202
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/
 	${INSTALL_DATA} ${WRKDIR}/20-nvidia-drm-outputclass.conf ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/
 
 post-patch:
 	# Workaround for LLVM/Clang19
 	${REINPLACE_CMD} -e '/DRMKMODDIR.*\/linuxkpi\/dummy\/include/d' \
 		${WRKSRC}/Makefile
 
 	# Workaround for the issue that X11 cannot acquire modesetting
 	# permission by disabling hw.nvidiadrm.fbdev tunable which is
 	# enabled on 570 series and later of the driver.
 	# This is due to the issue lacking proper support for fbdev
 	# (would be simpledrm) in graphics/drm-*-kmod and/or LinuxKPI.
 	# Would be reverted once the issues are sorted and fixed.
 .if ${NVVERSION} >= 570.00000
 	${REINPLACE_CMD} -e 's:\&nv_drm_fbdev_module_param\,  1\,:\&nv_drm_fbdev_module_param\,  0\,:' \
 		${WRKSRC}/nvidia-drm-freebsd-lkpi.c
 	${REINPLACE_CMD} -e 's:bool nv_drm_fbdev_module_param = true;:bool nv_drm_fbdev_module_param = false;:' \
 		${WRKSRC}/nvidia-drm-os-interface.c
 .endif
 	# Workaround for build failure on 575.51.02.
 	# --- nvidia-drm-drv.o ---
 	# nvidia-drm-drv.c:386:80: error: cast from 'const void *' to 'struct nv_drm_mst_display_info *' drops const qualifier [-Werror,-Wcast-qual]
 	#   386 |     struct nv_drm_mst_display_info *l_info = (struct nv_drm_mst_display_info *)l;
 	#       |                                                                                ^
 	# nvidia-drm-drv.c:387:80: error: cast from 'const void *' to 'struct nv_drm_mst_display_info *' drops const qualifier [-Werror,-Wcast-qual]
 	#   387 |     struct nv_drm_mst_display_info *r_info = (struct nv_drm_mst_display_info *)r;
 	#       |                                                                                ^
 .if ${NVVERSION} >= 575.00000
 	${REINPLACE_CMD} -e 's:struct nv_drm_mst_display_info \*l_info = (struct nv_drm_mst_display_info:const struct nv_drm_mst_display_info \*l_info = (const struct nv_drm_mst_display_info:' \
 		${WRKSRC}/nvidia-drm-drv.c
 	${REINPLACE_CMD} -e 's:struct nv_drm_mst_display_info \*r_info = (struct nv_drm_mst_display_info:const struct nv_drm_mst_display_info \*r_info = (const struct nv_drm_mst_display_info:' \
 		${WRKSRC}/nvidia-drm-drv.c
 .endif
 	# We should support -CURRENT: kill the check (first #if __FreeBSD_version)
 	linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
 			${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \
 			-e "$$linenum,+2d" ${WRKSRC}/../nvidia/nv-freebsd.h
 	# Workaround for build failure on any base without pm_vt_switch_required().
 	# 13.5, 14.3 and 15.0 doesn't have the stub (blank) function.
 	${REINPLACE_CMD} -e 's/.*pm_vt_switch_required(dev->dev, true);.*/#if __FreeBSD_version >= 1403507 \&\& __FreeBSD_version < 1500000 || __FreeBSD_version >= 1500504\n&\n#endif/' \
 		${WRKSRC}/nvidia-drm-drv.c
diff --git a/graphics/nvidia-drm-latest-kmod-devel/Makefile b/graphics/nvidia-drm-latest-kmod-devel/Makefile
index 5456f6f8bc56..9eeb42e62d11 100644
--- a/graphics/nvidia-drm-latest-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-latest-kmod-devel/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	595.58.03
+NVIDIA_DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-latest-kmod
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-latest-kmod-devel/distinfo b/graphics/nvidia-drm-latest-kmod-devel/distinfo
index 225c88e7af03..a32b777a523a 100644
--- a/graphics/nvidia-drm-latest-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-latest-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1774374411
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777389791
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = df7933202e61ebf8c9decb6835e4908817923fe4e76213e532873b0b611e8c63
 SIZE (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = 41512758
diff --git a/graphics/nvidia-drm-latest-kmod/distinfo b/graphics/nvidia-drm-latest-kmod/distinfo
index 225c88e7af03..a32b777a523a 100644
--- a/graphics/nvidia-drm-latest-kmod/distinfo
+++ b/graphics/nvidia-drm-latest-kmod/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1774374411
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777389791
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
 SHA256 (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = df7933202e61ebf8c9decb6835e4908817923fe4e76213e532873b0b611e8c63
 SIZE (freebsd-drm-kmod-drm_v6.9_1_GH0.tar.gz) = 41512758
diff --git a/graphics/nvidia-drm-latest-kmod/files/patch-nvidia-drm-freebsd-lkpi.c-20250918-01 b/graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01
similarity index 100%
rename from graphics/nvidia-drm-latest-kmod/files/patch-nvidia-drm-freebsd-lkpi.c-20250918-01
rename to graphics/nvidia-drm-latest-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c-20250918-01
diff --git a/x11/linux-nvidia-libs-devel/Makefile b/x11/linux-nvidia-libs-devel/Makefile
index 61137be1f726..bc3d691a5d4c 100644
--- a/x11/linux-nvidia-libs-devel/Makefile
+++ b/x11/linux-nvidia-libs-devel/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	595.58.03
+DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../linux-nvidia-libs
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/linux-nvidia-libs-devel/distinfo b/x11/linux-nvidia-libs-devel/distinfo
index c09cb155593e..9924687584a5 100644
--- a/x11/linux-nvidia-libs-devel/distinfo
+++ b/x11/linux-nvidia-libs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774373051
-SHA256 (NVIDIA-Linux-x86_64-595.58.03.run) = 8c0d4f967b7932c4ab5714272aee8103392b0a702c92afa555176d36205829f9
-SIZE (NVIDIA-Linux-x86_64-595.58.03.run) = 422873955
+TIMESTAMP = 1777388858
+SHA256 (NVIDIA-Linux-x86_64-595.71.05.run) = 36203b8960b7e49c8a42f6ba1f5863cde34a05e93d2b24b798af06dd846f6b82
+SIZE (NVIDIA-Linux-x86_64-595.71.05.run) = 423133031
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index c09cb155593e..9924687584a5 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774373051
-SHA256 (NVIDIA-Linux-x86_64-595.58.03.run) = 8c0d4f967b7932c4ab5714272aee8103392b0a702c92afa555176d36205829f9
-SIZE (NVIDIA-Linux-x86_64-595.58.03.run) = 422873955
+TIMESTAMP = 1777388858
+SHA256 (NVIDIA-Linux-x86_64-595.71.05.run) = 36203b8960b7e49c8a42f6ba1f5863cde34a05e93d2b24b798af06dd846f6b82
+SIZE (NVIDIA-Linux-x86_64-595.71.05.run) = 423133031
diff --git a/x11/nvidia-driver-devel/Makefile b/x11/nvidia-driver-devel/Makefile
index a8d2d6f06742..5b17c9b6a945 100644
--- a/x11/nvidia-driver-devel/Makefile
+++ b/x11/nvidia-driver-devel/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	595.58.03
+DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver-devel/distinfo b/x11/nvidia-driver-devel/distinfo
index 3c6adb621fec..6a6f41b38790 100644
--- a/x11/nvidia-driver-devel/distinfo
+++ b/x11/nvidia-driver-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774372890
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777388417
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 9d8833bf9541..fb838e8765c5 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -1,301 +1,301 @@
 # For those wondering why this port is not under `x11-drivers' category,
 # have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930.
 #
 # Starting with version 1.0-7667, NVidia has dropped support for numerous
 # "legacy" GPUs.  Consult NVidia README (the Appendix) to find out whether
 # you need to use legacy driver version and install one of corresponding
 # slave ports instead (`x11/nvidia-driver-470', `x11/nvidia-driver-390',
 # `x11/nvidia-driver-340', or `x11/nvidia-driver-304').
 #
 # To simplify testing of new feature branches and beta driver versions,
 # the port aims to support building against arbitrary DISTVERSION, i.e.
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	2
+PORTREVISION?=	0
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	x11@FreeBSD.org
 COMMENT?=	NVIDIA graphics driver userland
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 .include "${.CURDIR}/../nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 FLAVORS=	xorg xlibre
 FLAVOR?=	${FLAVORS:[1]}
 
 # the package provides lib32 versions of the libraries, which then depends
 # themselves in non existing lib32 libraries, so we don't want the package
 # to end up depending on non existing libraries
 NO_SHLIB_REQUIRES_GLOB=*:32
 
 # Choose proper distinfo file using PKGNAMESUFFIX for slave ports.
 # Kept for switching to centralized distinfo with suffixes.
 .ifdef PKGNAMESUFFIX
 DISTINFO_FILE=	${.CURDIR}/distinfo
 .endif
 
 # Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
 # obj/libEGL_nvidia.so.0 (see below)
 .if ${NVVERSION} >= 410.057
 PATCH_DEPENDS=	gsed:textproc/gsed
 BUILD_DEPENDS=	pkg-config:devel/pkgconf
 LIB_DEPENDS=	libOpenGL.so:graphics/libglvnd
 .endif
 
 RUN_DEPENDS=	${KMODDIR}/nvidia.ko:x11/nvidia-kmod${PKGNAMESUFFIX}
 
 .if ${NVVERSION} >= 415.013
 LIB_DEPENDS+=	libnvidia-egl-wayland.so:graphics/egl-wayland
 .endif
 
 .if ${NVVERSION} >= 580.00000
 LIB_DEPENDS+=	libnvidia-egl-xcb.so:graphics/egl-x11
 LIB_DEPENDS+=	libnvidia-egl-wayland2.so:graphics/egl-wayland2
 .endif
 
 USES=		uidfix xorg
 .if ${NVVERSION} >= 470.04201
 USES+=		tar:xz
 .endif
 
 USE_XORG=	x11 xext
 .if ${FLAVOR} == xlibre
 PKGNAMEPREFIX=	xlibre-
 USES+=xlibre
 USE_XLIBRE+=	xlibre-server
 CONFLICTS_BUILD+=	xorg-server
 .else
 USE_XORG+=	xorg-server
 CONFLICTS_BUILD+=	xlibre-server
 .endif
 
 USE_LDCONFIG=	yes
 
 PIE_UNSAFE=	yes
 
 EGL_JSON_PATH=		${PREFIX}/share/egl/egl_external_platform.d
 GLVND_JSON_PATH=	${PREFIX}/share/glvnd/egl_vendor.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} \
 		VKICD_PATH=${STAGEDIR}${VKICD_PATH} \
 		VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH}
 .if ${NVVERSION} < 495.02905
 MAKE_ENV+=	EGL_WAYLAND_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH}
 .else
 MAKE_ENV+=	EGL_EXTERNAL_PLATFORM_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH}
 .endif
 SUB_FILES=	pkg-message
 .if !defined(LIBGLDIR)
 SUB_FILES+=	nvidia.conf
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 EXTENSIONSDIR=	${MODULESDIR}/extensions/.nvidia
 PORTDOCS=	*
 
 .if ${NVVERSION} >= 331.013
 SUB_LIST+=	NVGL=""
 .else
 SUB_LIST+=	NVGL="\# "
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_SUB+=	MODULESDIR=${MODULESDIR}
 .if ${NVVERSION} < 410.057
 PLIST_SUB+=	EXTENSIONSDIR=${EXTENSIONSDIR}
 .else
 PLIST_SUB+=	EXTENSIONSDIR="@comment "
 .endif
 
 # Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB
 .if ${NVVERSION} >= 515.04304
 PLIST_FILES+=	lib/libnvidia-wayland-client.so.${DISTVERSION}
 .endif
 
 CONFLICTS_INSTALL+=	nvidia-driver*
 
 .include <bsd.port.pre.mk>
 
 pre-patch:
 .for p in ${SUB_PATCHES}
 	@${SED} 's/%%NVSRC%%/${NVSRC}/g' ${PATCHDIR}/${p}.in > ${WRKDIR}/${p}
 .endfor
 .for p in ${SUB_PATCHES}
 EXTRA_PATCHES+=	${WRKDIR}/${p}
 .endfor
 
 post-patch: .SILENT
 # Patch only needed for non-kmod
 	${REINPLACE_CMD} -e '/SUBDIR=\tsrc \\/d' -e 's/\tlib/SUBDIR=\tlib/' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/\.if exists(firmware)/,/\.endif/d' \
 		${WRKSRC}/Makefile
 
 .if ${NVVERSION} >= 390
 	${REINPLACE_CMD} -e 's|/man/man1|/share/man/man1|' ${WRKSRC}/nvml/man/Makefile
 .endif
 # Disable installation of Linux libraries (provided by the corresponding
 # `x11/linux-nvidia-libs' port or its slaves)
 	${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \
 		${WRKSRC}/lib/Makefile
 # Do not install VDPAU libraries which are provided by `multimedia/libvdpau'
 # port for a while now
 	${REINPLACE_CMD} -e '/libvdpau[[:blank:]_][^n]/d ; \
 		s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile
 # Do not build any binaries (native nvidia-settings and nvidia-xconfig are
 # provided by their corresponding ports) and manual pages
 	${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile
 	${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile
 # Also do not install libnvidia-gtk* libraries which are for nvidia-settings
 .if ${NVVERSION} >= 346.016
 	${REINPLACE_CMD} -e '/libnvidia-gtk/d' ${WRKSRC}/lib/Makefile
 .endif
 # Adjust installation path of a conflicting file (shared between
 # nvidia-driver and xorg-server) to ease package manager work
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -e '/LIBDIR/s:xorg/modules/extensions:&/.nvidia:' \
 		${WRKSRC}/x11/extension/Makefile
 .endif
 # Do not execute afterinstall target (prevent automatic module registration
 # and "smart" installation of conflicting files heuristics)
 	${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \
 		${WRKSRC}/lib/Makefile ${WRKSRC}/src/${NVSRC}/Makefile
 # /usr/share/nvidia path is hardcoded in libGL and nvidia-settings, but we
 # won't adhere to this stupidity and install nvidia-application-profiles-*
 # files as part of documentation
 .if ${NVVERSION} >= 410.057
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile ${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} -e '/AUXLINK_LINK/s,\$${DESTDIR},,' \
 		${WRKSRC}/lib/libGLX_nvidia/Makefile
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/glvnd/egl_vendor\.d.{$$padding},${GLVND_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libglvnd/libEGL.so.1
 .elif ${NVVERSION} >= 334.016
 	${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \
 		${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile
 .endif
 .if ${NVVERSION} >= 415.013
 	prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \
 	gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${EGL_JSON_PATH}\x00," \
 		${WRKSRC}/obj/libEGL_nvidia.so.0
 .endif
 # Move symlinks under PREFIX
 .if ${NVVERSION} >= 525.08902
 	${REINPLACE_CMD} -e '/ln/s/$${LOCALBASE}\/lib/../' \
 		-e '/LIBDIR/!s/$${LOCALBASE}/$${DESTDIR}$${PREFIX}/' \
 		${WRKSRC}/lib/libnvidia-allocator/Makefile
 .endif
 # Conditionally install documentation (but you generally want it)
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile
 .endif
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \
 		${STAGEDIR}${PREFIX}/${MODULESDIR}/extensions
 
 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
 	${REINPLACE_CMD} -e '/libnvidia-glvkspirv\.so/d ; \
 		/nvidia_icd\.json/d ; /nvidia_layers\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016
 	${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} >= 310.019
 	${REINPLACE_CMD} -e '/libXvMCNVIDIA/d' ${TMPPLIST}
 .else	# some applications need this symlink (see PR ports/72877)
 	${LN} -sf libXvMCNVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1
 .endif
 .if ${NVVERSION} < 331.013 || ${ARCH} == amd64 && ${NVVERSION} < 334.016
 	${REINPLACE_CMD} -E '/lib(nvidia-)?(EGL|eglcore|GLESv|glsi)/d' \
 		${TMPPLIST}
 .endif
 .if ${NVVERSION} < 352.009
 	${REINPLACE_CMD} -E '/(lib)?nvidia-(debugdump|smi|ml)/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 410.057
 	${REINPLACE_CMD} -E '/lib(EGL|GLESv[12].*)_nvidia/d ; \
 		/lib(GLX|GLdispatch|OpenGL)/d ; \
 		/extensions\/libglxserver_nvidia\.so/d ; \
 		/10_nvidia\.json/d' ${TMPPLIST}
 .else
 	${REINPLACE_CMD} -e '/extensions\/\.nvidia\/libglx/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 415.013
 	${REINPLACE_CMD} -e '/libnvidia-egl-wayland\.so/d ; \
 		/10_nvidia_wayland\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 440.036
 	${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST}
 .elif ${NVVERSION} < 465.01901
 	${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 470.074 || ${NVVERSION} >= 545.000
 	${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 495.02905
 	${REINPLACE_CMD} -e '/libnvidia-egl-gbm\.so/d ; \
 		/15_nvidia_gbm\.json/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 525.08902
 	${REINPLACE_CMD} -e '/libnvidia-allocator\.so/d ; \
 		/nvidia-drm_gbm\.so/d' ${TMPPLIST}
 .endif
 .if ${NVVERSION} < 545.000
 	${REINPLACE_CMD} -e '/libnvidia-gpucomp\.so/d' ${TMPPLIST}
 .endif
 
 .if ${NVVERSION} < 410.057
 # Rename some libraries and install a libmap file to resolve conflict with
 # Mesa libraries.
 	${LN} -sf libGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGL.so
 .  if ${NVVERSION} >= 331.013
 	${LN} -sf libEGL-NVIDIA.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \
 		${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1
 	${RM} ${STAGEDIR}${PREFIX}/lib/libEGL.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so.1
 	${LN} -sf libGLESv2-NVIDIA.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so
 	${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \
 		${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so.2
 	${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so
 .  endif
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d/
 	${INSTALL_DATA} ${WRKDIR}/nvidia.conf \
 		${STAGEDIR}${PREFIX}/etc/libmap.d/
 .else
 	${REINPLACE_CMD} -E '/-NVIDIA/d ; \
 		/lib(Open)?E?GLX?(ESv[12](_CM)?|dispatch)?\.so/d' \
 		${TMPPLIST}
 # Override mesa.conf if GLX_EXT_libglvnd is missing
 	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_nvidia.so.0" \
 		>${STAGEDIR}${PREFIX}/etc/libmap.d/nvidia.conf
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version
index 7331f723d983..35fc5081ce3c 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.58.03
+NVIDIA_DISTVERSION?= 595.71.05
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 3c6adb621fec..6a6f41b38790 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774372890
-SHA256 (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = dccbda46fc39dbfe081f1333c7227b480c86e6d5125bb5a03ab782995bdda6ef
-SIZE (NVIDIA-FreeBSD-x86_64-595.58.03.tar.xz) = 328835816
+TIMESTAMP = 1777388417
+SHA256 (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 690ea1fed7b4310e5a6977738eb51a27593aa1ebf6e50a5853f1bedfccc782cf
+SIZE (NVIDIA-FreeBSD-x86_64-595.71.05.tar.xz) = 328170544
diff --git a/x11/nvidia-kmod-devel/Makefile b/x11/nvidia-kmod-devel/Makefile
index d1ddb4a83141..d978cc4366da 100644
--- a/x11/nvidia-kmod-devel/Makefile
+++ b/x11/nvidia-kmod-devel/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	595.58.03
+DISTVERSION?=	595.71.05
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-kmod
 PKGNAMESUFFIX=	-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 0af34801bf90..b62e6f988737 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	nvidia-settings
-PORTVERSION=	595.58.03
+PORTVERSION=	595.71.05
 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 cc752fe502df..935401d09011 100644
--- a/x11/nvidia-settings/distinfo
+++ b/x11/nvidia-settings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774401542
-SHA256 (NVIDIA-nvidia-settings-595.58.03_GH0.tar.gz) = 405c70e99f9478b5ca7460b100057d58ea58265cf5e7ba2ae616d0926e82d528
-SIZE (NVIDIA-nvidia-settings-595.58.03_GH0.tar.gz) = 1326775
+TIMESTAMP = 1777394031
+SHA256 (NVIDIA-nvidia-settings-595.71.05_GH0.tar.gz) = 529f7976e0b42ead0e3d173d09dadd353bbe364aa992244e94b1a98901795a05
+SIZE (NVIDIA-nvidia-settings-595.71.05_GH0.tar.gz) = 1327178
diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
index 4b29ce9d3d2d..e0e5bcf1fba0 100644
--- a/x11/nvidia-xconfig/Makefile
+++ b/x11/nvidia-xconfig/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	nvidia-xconfig
-PORTVERSION=	595.58.03
+PORTVERSION=	595.71.05
 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 af5a00fd7424..d9128409395d 100644
--- a/x11/nvidia-xconfig/distinfo
+++ b/x11/nvidia-xconfig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1774401671
-SHA256 (NVIDIA-nvidia-xconfig-595.58.03_GH0.tar.gz) = a6fffd49cd7730d9c3e606e33489cfdba37cf8b9e1be146eaf20686b3b6795ca
-SIZE (NVIDIA-nvidia-xconfig-595.58.03_GH0.tar.gz) = 145288
+TIMESTAMP = 1777394090
+SHA256 (NVIDIA-nvidia-xconfig-595.71.05_GH0.tar.gz) = fe73d85a6b35af2483b8925eedf9518bb7508c293fd3b559699bb3d80a757a12
+SIZE (NVIDIA-nvidia-xconfig-595.71.05_GH0.tar.gz) = 145288