diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -14,7 +14,7 @@
 PORTNAME?=	nvidia-driver
 DISTVERSION?=	${NVIDIA_DISTVERSION}
 # Always try to set PORTREVISION as it can be overridden by the slave ports
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11
 MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
@@ -80,12 +80,6 @@
 SUB_PATCHES+=	extra-patch-src-nvidia_subr.c
 .endif
 
-# Temporarily disable GSP firmware as it is known to cause
-# issues with suspend/resume
-.if ${NVVERSION} >= 565.00000
-SUB_PATCHES+=	extra-gsp-patch-src-nvidia_subr.c
-.endif
-
 DOCSDIR=	${PREFIX}/share/doc/NVIDIA_GLX-1.0
 MODULESDIR=	lib/xorg/modules
 EXTENSIONSDIR?=	${MODULESDIR}/extensions/.nvidia
@@ -141,6 +135,11 @@
 FREEBSD_AGP_DESC=	Use FreeBSD AGP GART driver
 .endif
 
+.if ${NVVERSION} >= 565.00000
+OPTIONS_DEFINE+=	GSP
+GSP_DESC=		GPU System Processor (GSP) firmware support
+.endif
+
 PLIST_SUB+=	MODULESDIR=${MODULESDIR}
 .if ${NVVERSION} < 410.057
 PLIST_SUB+=	EXTENSIONSDIR=${EXTENSIONSDIR}
@@ -165,6 +164,14 @@
 
 .include <bsd.port.pre.mk>
 
+# Temporarily disable GSP firmware by default as it is known
+# to cause issues with suspend/resume
+.if ${NVVERSION} >= 565.00000
+.  if ! ${PORT_OPTIONS:MGSP}	# Disable GSP support
+SUB_PATCHES+=	extra-gsp-patch-src-nvidia_subr.c
+.  endif
+.endif
+
 pre-patch:
 .for p in ${SUB_PATCHES}
 	@${SED} 's/%%NVSRC%%/${NVSRC}/g' ${PATCHDIR}/${p}.in > ${WRKDIR}/${p}