Index: x11/linux-nvidia-libs/Makefile
===================================================================
--- x11/linux-nvidia-libs/Makefile
+++ x11/linux-nvidia-libs/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nvidia-libs
-DISTVERSION?=	525.116.03
+DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11 linux
@@ -13,6 +13,7 @@
 WWW=		https://www.nvidia.com/object/unix.html
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
+.include "${.CURDIR}/../nvidia-driver/Makefile.version"
 .include "${.CURDIR}/../nvidia-driver/Makefile.common"
 
 .if ${DISTVERSION:R} > 390
Index: x11/linux-nvidia-libs/distinfo
===================================================================
--- x11/linux-nvidia-libs/distinfo
+++ x11/linux-nvidia-libs/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1682616491
+TIMESTAMP = 1684533616
+SHA256 (NVIDIA-Linux-x86_64-530.41.03.run) = ae27a16a968c85503f5d161dda343c1602612b025f4aee15f92e2ea0acb784b1
+SIZE (NVIDIA-Linux-x86_64-530.41.03.run) = 344312858
 SHA256 (NVIDIA-Linux-x86_64-525.116.03.run) = 5c295b02ebec2e9a9ec0d79ba9292eb623b4b2fbba8a6ed619060929a30d0469
 SIZE (NVIDIA-Linux-x86_64-525.116.03.run) = 414602354
 SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640
Index: x11/nvidia-driver/Makefile
===================================================================
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -12,7 +12,7 @@
 # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
 
 PORTNAME?=	nvidia-driver
-DISTVERSION?=	525.116.03
+DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
 PORTREVISION?=	0
 CATEGORIES=	x11
@@ -25,6 +25,7 @@
 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"
 
 # Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and
@@ -68,8 +69,10 @@
 SUB_FILES+=	pkg-deinstall pkg-install
 .endif
 SUB_PATCHES=	extra-patch-src-Makefile \
-		extra-patch-src-nv-freebsd.h \
-		extra-patch-src-nvidia_subr.c
+		extra-patch-src-nv-freebsd.h
+.if ${NVVERSION} < 530.03002
+SUB_PATCHES += extra-patch-src-nvidia_subr.c
+.endif
 .if ${NVVERSION} < 510.03901
 SUB_PATCHES+=	extra-patch-src-nvidia_dev.c \
 		extra-patch-src-nvidia_pci.c
@@ -177,11 +180,13 @@
 	${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \
 		${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c
 .endif
+.if ${NVVERSION} < 530.03002
 # KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318
 	${REINPLACE_CMD} \
 	    -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \
 	    -e 's/kmem_free(kmem_arena, /kmem_free(/' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
+.endif
 # Pull the right header after FreeBSD src r347984
 .if ${OSVERSION} >= 1300029 && ${NVVERSION} >= 358.009
 	${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \
@@ -259,6 +264,7 @@
 .endif
 # Catch up with pmap_unmapdev() and kmem_*() changes in 14-CURRENT
 .if ${OSVERSION} >= 1400070
+.if ${NVVERSION} < 530.03002
 	${REINPLACE_CMD} -e '/pmap_unmapdev/s,(vm_offset_t),,' \
 		${WRKSRC}/src/${NVSRC}/nvidia_os.c
 	${REINPLACE_CMD} -e '/vm_offset_t virtual_address/s,vm_offset_t ,char *,' \
@@ -266,6 +272,7 @@
 	${REINPLACE_CMD} -e '/vm_offset_t address;/s,vm_offset_t ,void *,' \
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
+.endif
 # Finally, process OPTIONS
 .if ${PORT_OPTIONS:MFREEBSD_AGP}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
Index: x11/nvidia-driver/Makefile.version
===================================================================
--- /dev/null
+++ x11/nvidia-driver/Makefile.version
@@ -0,0 +1,4 @@
+# NVIDIA Distversion
+#
+# This will be included from x11/nvidia-driver and the nvidia-drm port
+NVIDIA_DISTVERSION = 530.41.03
Index: x11/nvidia-driver/distinfo
===================================================================
--- x11/nvidia-driver/distinfo
+++ x11/nvidia-driver/distinfo
@@ -1,4 +1,6 @@
 TIMESTAMP = 1682616247
+SHA256 (NVIDIA-FreeBSD-x86_64-530.41.03.tar.xz) = 367dbd863d2d9748bac10526141bee4e33acb840934ba25bf503184867cfecc8
+SIZE (NVIDIA-FreeBSD-x86_64-530.41.03.tar.xz) = 135208192
 SHA256 (NVIDIA-FreeBSD-x86_64-525.116.03.tar.xz) = 7a4cca406cc58b928c422bd62e1f2d2ab6d82b7ad756ea67a656240ec432a9cd
 SIZE (NVIDIA-FreeBSD-x86_64-525.116.03.tar.xz) = 136885220
 SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607