diff --git a/graphics/nvidia-drm-510-kmod/files/patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-510-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
rename from graphics/nvidia-drm-510-kmod/files/patch-nvidia-drm-freebsd-lkpi.c
rename to graphics/nvidia-drm-510-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
diff --git a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
rename from graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c
rename to graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
diff --git a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
rename from graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-freebsd-lkpi.c
rename to graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c
diff --git a/graphics/nvidia-drm-kmod/Makefile b/graphics/nvidia-drm-kmod/Makefile
--- a/graphics/nvidia-drm-kmod/Makefile
+++ b/graphics/nvidia-drm-kmod/Makefile
@@ -18,9 +18,9 @@
 RUN_DEPENDS+=  ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod
 .  elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64)
 RUN_DEPENDS+=  ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod
-.  elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1500008
+.  elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1400508
 RUN_DEPENDS+=  ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-515-kmod
-.  elif ${OSVERSION} >= 1500008
+.  elif ${OSVERSION} >= 1400508
 RUN_DEPENDS+=  ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod
 .  endif
 .endif
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
@@ -30,6 +30,10 @@
 WRKSRC=		${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/
 WRKSRC_SUBDIR=	src/nvidia-drm/
 
+.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/