diff --git a/graphics/nvidia-drm-515-kmod-580/Makefile b/graphics/nvidia-drm-515-kmod-580/Makefile
index 6b237d7df0ca..af71a3da4f84 100644
--- a/graphics/nvidia-drm-515-kmod-580/Makefile
+++ b/graphics/nvidia-drm-515-kmod-580/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	580.159.04
+NVIDIA_DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	3
+PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-515-kmod
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-515-kmod-580/distinfo b/graphics/nvidia-drm-515-kmod-580/distinfo
index af0c9980a8e8..a25a9d2dbb4d 100644
--- a/graphics/nvidia-drm-515-kmod-580/distinfo
+++ b/graphics/nvidia-drm-515-kmod-580/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340157
-SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224
-SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328
+TIMESTAMP = 1782636316
+SHA256 (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 6d24d2e8cd19a39e935ae7ccf1e52d7770ec4dce09055778a3653a7f3a82620a
+SIZE (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 289938560
 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-580/Makefile b/graphics/nvidia-drm-61-kmod-580/Makefile
index 18f21da3b96f..5e71c7867d60 100644
--- a/graphics/nvidia-drm-61-kmod-580/Makefile
+++ b/graphics/nvidia-drm-61-kmod-580/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	580.159.04
+NVIDIA_DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	3
+PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-61-kmod
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-61-kmod-580/distinfo b/graphics/nvidia-drm-61-kmod-580/distinfo
index 1230989649cd..38e82a829eda 100644
--- a/graphics/nvidia-drm-61-kmod-580/distinfo
+++ b/graphics/nvidia-drm-61-kmod-580/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340064
-SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224
-SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328
+TIMESTAMP = 1782636351
+SHA256 (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 6d24d2e8cd19a39e935ae7ccf1e52d7770ec4dce09055778a3653a7f3a82620a
+SIZE (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 289938560
 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-580/Makefile b/graphics/nvidia-drm-612-kmod-580/Makefile
index 9462932f1424..0f669231a454 100644
--- a/graphics/nvidia-drm-612-kmod-580/Makefile
+++ b/graphics/nvidia-drm-612-kmod-580/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	580.159.04
+NVIDIA_DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	2
+PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-612-kmod
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-612-kmod-580/distinfo b/graphics/nvidia-drm-612-kmod-580/distinfo
index e2824cda3094..2bf7df339984 100644
--- a/graphics/nvidia-drm-612-kmod-580/distinfo
+++ b/graphics/nvidia-drm-612-kmod-580/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340174
-SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224
-SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328
+TIMESTAMP = 1782636436
+SHA256 (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 6d24d2e8cd19a39e935ae7ccf1e52d7770ec4dce09055778a3653a7f3a82620a
+SIZE (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 289938560
 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-580/Makefile b/graphics/nvidia-drm-66-kmod-580/Makefile
index fe4a66924879..d93a13d68293 100644
--- a/graphics/nvidia-drm-66-kmod-580/Makefile
+++ b/graphics/nvidia-drm-66-kmod-580/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	580.159.04
+NVIDIA_DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	3
+PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-66-kmod
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-66-kmod-580/distinfo b/graphics/nvidia-drm-66-kmod-580/distinfo
index 399cd53601b2..2d83e10471b6 100644
--- a/graphics/nvidia-drm-66-kmod-580/distinfo
+++ b/graphics/nvidia-drm-66-kmod-580/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780340144
-SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224
-SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328
+TIMESTAMP = 1782636397
+SHA256 (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 6d24d2e8cd19a39e935ae7ccf1e52d7770ec4dce09055778a3653a7f3a82620a
+SIZE (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 289938560
 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-kmod-580/Makefile b/graphics/nvidia-drm-kmod-580/Makefile
index 3301c6df1e03..f595ebb8e3e9 100644
--- a/graphics/nvidia-drm-kmod-580/Makefile
+++ b/graphics/nvidia-drm-kmod-580/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	580.159.04
+DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	1
+PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-drm-kmod
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
index ea6b633c2530..2869f9675c99 100644
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -1,97 +1,97 @@
 # 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*)
+.if (${NVVERSION} < 580.17302 || ${NVVERSION} >= 590.00000 && ${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
 	# Workaround for build failure on graphics/nvidia-drm-515-kmod*,
 	# as struct dma_buf_map was renamed to struct iosys_map at Linux 5.18 (DRM5.18).
 .if ${.CURDIR:M*nvidia-drm-515-kmod*}
 	${REINPLACE_CMD} -e 's:defined(NV_LINUX_IOSYS_MAP_H_PRESENT):0:' ${WRKSRC}/nvidia-drm-gem.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-580/Makefile b/graphics/nvidia-drm-latest-kmod-580/Makefile
index 9fa7548cfa5c..2e406841a234 100644
--- a/graphics/nvidia-drm-latest-kmod-580/Makefile
+++ b/graphics/nvidia-drm-latest-kmod-580/Makefile
@@ -1,7 +1,7 @@
-NVIDIA_DISTVERSION?=	580.159.04
+NVIDIA_DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION=	2
+PORTREVISION=	0
 MASTERDIR=	${.CURDIR}/../nvidia-drm-latest-kmod
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/nvidia-drm-latest-kmod-580/distinfo b/graphics/nvidia-drm-latest-kmod-580/distinfo
index 937c689354c7..ccd4e2c2b65e 100644
--- a/graphics/nvidia-drm-latest-kmod-580/distinfo
+++ b/graphics/nvidia-drm-latest-kmod-580/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1779520216
-SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224
-SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328
+TIMESTAMP = 1782636471
+SHA256 (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 6d24d2e8cd19a39e935ae7ccf1e52d7770ec4dce09055778a3653a7f3a82620a
+SIZE (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 289938560
 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-580/Makefile b/x11/linux-nvidia-libs-580/Makefile
index d4f1571d5288..255492f4984d 100644
--- a/x11/linux-nvidia-libs-580/Makefile
+++ b/x11/linux-nvidia-libs-580/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	580.159.04
+DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../linux-nvidia-libs
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/linux-nvidia-libs-580/distinfo b/x11/linux-nvidia-libs-580/distinfo
index 30de04b1cd05..3a343064240a 100644
--- a/x11/linux-nvidia-libs-580/distinfo
+++ b/x11/linux-nvidia-libs-580/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1779340276
-SHA256 (NVIDIA-Linux-x86_64-580.159.04.run) = c1e66761b088d17b3adf6cb6979de9af38be2684d102b001a176dcfafabdca1e
-SIZE (NVIDIA-Linux-x86_64-580.159.04.run) = 397162548
+TIMESTAMP = 1782636231
+SHA256 (NVIDIA-Linux-x86_64-580.173.02.run) = 8d8eb9001e05a9a8a663d3d5d304feb64ef2844ee185ccdfd952786820f46e1b
+SIZE (NVIDIA-Linux-x86_64-580.173.02.run) = 398312209
diff --git a/x11/nvidia-driver-580/Makefile b/x11/nvidia-driver-580/Makefile
index dc58485bfde1..3411cd945d5f 100644
--- a/x11/nvidia-driver-580/Makefile
+++ b/x11/nvidia-driver-580/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	580.159.04
+DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-driver
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver-580/distinfo b/x11/nvidia-driver-580/distinfo
index c3359a5b4a4a..58d4fafe3f6a 100644
--- a/x11/nvidia-driver-580/distinfo
+++ b/x11/nvidia-driver-580/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1779339976
-SHA256 (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 658a163d482fa999404ecd5033aba6976f70544daf6f02953408efcd3be6e224
-SIZE (NVIDIA-FreeBSD-x86_64-580.159.04.tar.xz) = 289159328
+TIMESTAMP = 1782636071
+SHA256 (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 6d24d2e8cd19a39e935ae7ccf1e52d7770ec4dce09055778a3653a7f3a82620a
+SIZE (NVIDIA-FreeBSD-x86_64-580.173.02.tar.xz) = 289938560
diff --git a/x11/nvidia-kmod-580/Makefile b/x11/nvidia-kmod-580/Makefile
index fa24e272fdf1..bbf5df4d2422 100644
--- a/x11/nvidia-kmod-580/Makefile
+++ b/x11/nvidia-kmod-580/Makefile
@@ -1,8 +1,8 @@
-DISTVERSION?=	580.159.04
+DISTVERSION?=	580.173.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../nvidia-kmod
 PKGNAMESUFFIX=	-580
 
 .include "${MASTERDIR}/Makefile"