diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 697c9ed82422..9146c1a35a6b 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -139,7 +139,8 @@ PLIST_SUB+=	LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
 PLIST_SUB+=	LIBGLDIR="@comment " LIBGLMAP=""
 .endif
 
-.if ${NVVERSION} >= 515.08601
+# Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB
+.if ${NVVERSION} >= 515.04304
 PLIST_FILES+=	lib/libnvidia-wayland-client.so.${DISTVERSION}
 .endif
 
@@ -267,8 +268,10 @@ post-patch: .SILENT
 		${WRKSRC}/src/${NVSRC}/nvidia_subr.c
 .endif
 # Fix a K&R prototype
+.if ${NVVERSION:R} >= 390
 	${REINPLACE_CMD} -e '/nvlink_allocLock/s,(),(void),' \
 		${WRKSRC}/src/${NVSRC}/nvlink_freebsd.c
+.endif
 # Finally, process OPTIONS
 .if ${PORT_OPTIONS:MFREEBSD_AGP}
 	${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \