diff --git a/x11/linux-nvidia-libs-470/Makefile b/x11/linux-nvidia-libs-470/Makefile
new file mode 100644
index 000000000000..4f483a8cc553
--- /dev/null
+++ b/x11/linux-nvidia-libs-470/Makefile
@@ -0,0 +1,8 @@
+DISTVERSION=	470.103.01
+# Explicitly set PORTREVISION as it can be overridden by the master port
+PORTREVISION=	0
+
+MASTERDIR=	${.CURDIR}/../linux-nvidia-libs
+PKGNAMESUFFIX=	-470
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index 2ea449ae90e7..2535541f1922 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,15 +1,17 @@
-TIMESTAMP = 1643748640
+TIMESTAMP = 1643752034
 SHA256 (NVIDIA-Linux-x86_64-510.47.03.run) = f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690
 SIZE (NVIDIA-Linux-x86_64-510.47.03.run) = 328823536
+SHA256 (NVIDIA-Linux-x86_64-470.103.01.run) = 56c2309f89c213463b0c46360f7b2275d7371d3c727af3fedc88c496edc887a5
+SIZE (NVIDIA-Linux-x86_64-470.103.01.run) = 272484410
 SHA256 (NVIDIA-Linux-x86_64-390.144.run) = 8bb6e8de89e8f8325466af29cf0fa235c988d19137f7fe3eb6bfae1d5e305e74
 SIZE (NVIDIA-Linux-x86_64-390.144.run) = 85000417
 SHA256 (NVIDIA-Linux-x86-390.144.run) = fa586d11fcf103f81eda7d859a2a8ccdeb7371f4742fe942cb4a9b0aeb6bbb30
 SIZE (NVIDIA-Linux-x86-390.144.run) = 49210937
 SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b
 SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522
 SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca
 SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892
 SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2
 SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133
 SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8
 SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115
diff --git a/x11/nvidia-driver-470/Makefile b/x11/nvidia-driver-470/Makefile
new file mode 100644
index 000000000000..bb8ca9d76de2
--- /dev/null
+++ b/x11/nvidia-driver-470/Makefile
@@ -0,0 +1,8 @@
+DISTVERSION=	470.103.01
+# Explicitly set PORTREVISION as it can be overridden by the master port
+PORTREVISION=	0
+
+MASTERDIR=	${.CURDIR}/../nvidia-driver
+PKGNAMESUFFIX=	-470
+
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/nvidia-driver/Makefile.common b/x11/nvidia-driver/Makefile.common
index 101299e744ef..67b10e0f1eb8 100644
--- a/x11/nvidia-driver/Makefile.common
+++ b/x11/nvidia-driver/Makefile.common
@@ -1,37 +1,41 @@
 # LICENSE_FILE is set in the consumer ports because its location varies
 LICENSE=	NVIDIA
 LICENSE_NAME=	License For Customer Use of NVIDIA Software
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 .if ${DISTVERSION:R} > 390
 ONLY_FOR_ARCHS=	amd64
 .else
 ONLY_FOR_ARCHS=	i386 amd64
 .endif
 
 ARCH_SUFX=	x86${ARCH:S/i386//:S/amd/_/}
 
 # NVVERSION is float since r372065 (integer values become less readable
 # after minor version could occupy three digits)
-.if ${DISTVERSION:C/[0-9]+//g} == ".."		# major.minor.update
-NVVERSION=	${DISTVERSION:S/./.0/:R}${DISTVERSION:E}
-.else						# major.minor
+.if ${DISTVERSION:C/[0-9]+//g} == ".."				# major.minor.update
+.  if ${DISTVERSION:C/[0-9]+\.([0-9]+)\.[0-9]+/\1/} < 100
+NVVERSION=	${DISTVERSION:S/./.0/:R}${DISTVERSION:E}	# allow minor > 99
+.  else
+NVVERSION=	${DISTVERSION:R}${DISTVERSION:E}
+.  endif
+.else								# major.minor
 .  if ${DISTVERSION:E} < 100
-NVVERSION=	${DISTVERSION:S/./.0/}		# allow minor > 99
+NVVERSION=	${DISTVERSION:S/./.0/}				# allow minor > 99
 .  else
 NVVERSION=	${DISTVERSION}
 .  endif
 .endif
 
 # Target below can be used instead of standard `makesum' to correctly
 # update distinfo (i.e., keeping other driver version entries intact)
 .if ${.TARGETS:Mupdate-distinfo}
 DISTINFO_FILE=	${MASTERDIR}/distinfo.new
 .endif
 
 update-distinfo: makesum .SILENT
 	${REINPLACE_CMD} -e '/${ARCH_SUFX}-${NVVERSION:R}/s/^/~/' \
 		${MASTERDIR}/distinfo
 	${REINPLACE_CMD} -e '/^~SHA256/r ${DISTINFO_FILE}' -e '/^~/d' \
 		${MASTERDIR}/distinfo
 	${RM} ${DISTINFO_FILE} ${MASTERDIR}/distinfo.bak
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index 63d2db77c47f..b2b82b2dac4d 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,15 +1,17 @@
-TIMESTAMP = 1643747691
+TIMESTAMP = 1643751307
 SHA256 (NVIDIA-FreeBSD-x86_64-510.47.03.tar.xz) = 232e3cd9c4d2ae6648f3301241c1f46ad2624eca206a85b72b209400be8f2ddf
 SIZE (NVIDIA-FreeBSD-x86_64-510.47.03.tar.xz) = 108088660
+SHA256 (NVIDIA-FreeBSD-x86_64-470.103.01.tar.xz) = 9d35a9250336cc844543e13f12a0ce3373df9008dfcef5cccffad7c0b11b7d8e
+SIZE (NVIDIA-FreeBSD-x86_64-470.103.01.tar.xz) = 99373456
 SHA256 (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = a3ecf4d1cb7190c43e1c910a66c5920072fef887ccab70e11b899c748d880afd
 SIZE (NVIDIA-FreeBSD-x86_64-390.144.tar.gz) = 65333942
 SHA256 (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 438ef26d32a596f199ac38e90a799c71111374c66572a725546c26055de7054b
 SIZE (NVIDIA-FreeBSD-x86-390.144.tar.gz) = 65993042
 SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f
 SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286
 SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf
 SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768
 SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120
 SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676
 SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb
 SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011