--- b/Mk/bsd.port.mk	
+++ b/Mk/bsd.port.mk	
@@ -2668,7 +2668,11 @@ CONFIGURE_MAX_CMD_LEN!=	${SYSCTL} -n kern.argmax
 _EXPORTED_VARS+=	CONFIGURE_MAX_CMD_LEN
 GNU_CONFIGURE_PREFIX?=	${PREFIX}
 GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}
-CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}
+CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX}
+.if !${CONFIGURE_ARGS:M--disable-option-checking} && !${CONFIGURE_ARGS:M--enable-option-checking} && !${CONFIGURE_ARGS:M--enable-option-checking=*}
+CONFIGURE_ARGS+=	--enable-option-checking=fatal
+.endif
+CONFIGURE_ARGS+=	$${_LATE_CONFIGURE_ARGS}
 .if defined(CROSS_TOOLCHAIN)
 CROSS_HOST=		${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
 CONFIGURE_ARGS+=	--host=${CROSS_HOST}