diff --git a/graphics/nvidia-drm-510-kmod/Makefile b/graphics/nvidia-drm-510-kmod/Makefile
--- a/graphics/nvidia-drm-510-kmod/Makefile
+++ b/graphics/nvidia-drm-510-kmod/Makefile
@@ -5,6 +5,8 @@
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-510-kmod
 CONFLICTS_INSTALL=	nvidia-drm-510-kmod nvidia-drm-61-kmod nvidia-drm-66-kmod
 
+DRMNAME=	drm-510-kmod
+
 .include "${.CURDIR}/../drm-510-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 .include <bsd.port.options.mk>
diff --git a/graphics/nvidia-drm-510-kmod/distinfo b/graphics/nvidia-drm-510-kmod/distinfo
deleted file mode 100644
--- a/graphics/nvidia-drm-510-kmod/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1745331131
-SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
-SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
-SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa
-SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338
diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile
--- a/graphics/nvidia-drm-515-kmod/Makefile
+++ b/graphics/nvidia-drm-515-kmod/Makefile
@@ -6,6 +6,8 @@
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-515-kmod
 CONFLICTS_INSTALL=	nvidia-drm-510-kmod nvidia-drm-61-kmod nvidia-drm-66-kmod
 
+DRMNAME=	drm-515-kmod
+
 .include "${.CURDIR}/../drm-515-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 
diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo
deleted file mode 100644
--- a/graphics/nvidia-drm-515-kmod/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1747290835
-SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
-SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
-SHA256 (freebsd-drm-kmod-drm_v5.15.160_3_GH0.tar.gz) = e6eef2927f3d683be0faf286b2723fecf962ef2e48a2be87326a83579f82a55b
-SIZE (freebsd-drm-kmod-drm_v5.15.160_3_GH0.tar.gz) = 26098374
diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile
--- a/graphics/nvidia-drm-61-kmod/Makefile
+++ b/graphics/nvidia-drm-61-kmod/Makefile
@@ -6,6 +6,8 @@
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-61-kmod
 CONFLICTS_INSTALL=	nvidia-drm-510-kmod nvidia-drm-515-kmod nvidia-drm-66-kmod
 
+DRMNAME=	drm-61-kmod
+
 .include "${.CURDIR}/../drm-61-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 
diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo
deleted file mode 100644
--- a/graphics/nvidia-drm-61-kmod/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1747032829
-SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
-SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
-SHA256 (freebsd-drm-kmod-drm_v6.1.128_3_GH0.tar.gz) = 6b786181c38e9cc820772c19f97a37198fe510b229597a2b0b018cbe3486fd0b
-SIZE (freebsd-drm-kmod-drm_v6.1.128_3_GH0.tar.gz) = 37102599
diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile
--- a/graphics/nvidia-drm-66-kmod/Makefile
+++ b/graphics/nvidia-drm-66-kmod/Makefile
@@ -6,6 +6,8 @@
 RUN_DEPENDS+=	${KMODDIR}/drm.ko:graphics/drm-66-kmod
 CONFLICTS_INSTALL=	nvidia-drm-510-kmod nvidia-drm-515-kmod nvidia-drm-61-kmod
 
+DRMNAME=	drm-66-kmod
+
 .include "${.CURDIR}/../drm-66-kmod/Makefile.version"
 .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
 
diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo
deleted file mode 100644
--- a/graphics/nvidia-drm-66-kmod/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1747033019
-SHA256 (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 7912c9f101b29fec10c434b1389b1403489fa3008fae67d1b76ef3d9f4b5388f
-SIZE (NVIDIA-FreeBSD-x86_64-570.144.tar.xz) = 260506500
-SHA256 (freebsd-drm-kmod-drm_v6.6.25_4_GH0.tar.gz) = 00c1cdba93dde777758273aa312ac47d08ea89b3c703cfb73b1826d14d1627c0
-SIZE (freebsd-drm-kmod-drm_v6.6.25_4_GH0.tar.gz) = 38487894
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -4,11 +4,11 @@
 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
+				https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_DISTVERSION}-${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
+				freebsd-drm-kmod-${DRM_KMOD_DISTVERSION}-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm
 
 ONLY_FOR_ARCHS=	amd64
 USES=		kmod uidfix tar:xz
@@ -30,6 +30,11 @@
 WRKSRC=		${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/
 WRKSRC_SUBDIR=	src/nvidia-drm/
 
+WRKDIST=	${.CURDIR}/workdist
+TMPDST_NV=	${WRKDIST}/distinfo-nvidia
+TMPDST_DRM=	${WRKDIST}/distinfo-drm
+DISTINFO_FILE=	${WRKDIST}/distinfo${PKGNAMESUFFIX}
+
 .if ${NVVERSION} < 565.00000
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-conftest.h
 .endif #565.00
@@ -38,6 +43,16 @@
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c
 .endif
 
+pre-fetch: .SILENT
+	${MKDIR} ${WRKDIST}
+	${CP} ${.CURDIR}/../${DRMNAME}/distinfo ${TMPDST_DRM}
+	${CP} ${.CURDIR}/../../x11/nvidia-driver${PKGNAMESUFFIX}/distinfo ${TMPDST_NV}
+	${REINPLACE_CMD} -e '/TIMESTAMP/d' ${TMPDST_DRM}
+	${CAT} ${TMPDST_NV} ${TMPDST_DRM} > ${DISTINFO_FILE}
+
+post-clean: .SILENT
+	${RM} -r ${WRKDIST}
+
 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/