Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk
+++ Mk/bsd.options.mk
@@ -197,8 +197,6 @@
 			package:300:pre package:500:do package:700:post \
 			stage:800:post
 
-PORT_OPTIONS+=	DOCS NLS EXAMPLES IPV6
-
 # Add per arch options
 .for opt in ${OPTIONS_DEFINE_${ARCH}}
 .if empty(OPTIONS_DEFINE:M${opt})
@@ -223,11 +221,10 @@
 .  endif
 .endfor
 
-# Remove options the port maintainer doesn't want
+# Remove options the port maintainer doesn't want, part 1
 .for opt in ${_ALL_EXCLUDE:O:u}
 OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:N${opt}}
 OPTIONS_DEFINE:=	${OPTIONS_DEFINE:N${opt}}
-PORT_OPTIONS:=		${PORT_OPTIONS:N${opt}}
 .  for otype in SINGLE RADIO MULTI GROUP
 .    for m in ${OPTIONS_${otype}}
 OPTIONS_${otype}_${m}:=	${OPTIONS_${otype}_${m}:N${opt}}
@@ -257,6 +254,18 @@
 .  endfor
 .endfor
 
+# Some options are always enabled by default.
+.for _opt in DOCS NLS EXAMPLES IPV6
+.if ${COMPLETE_OPTIONS_LIST:M${_opt}}
+PORT_OPTIONS+=	${_opt}
+.endif
+.endfor
+
+# Remove options the port maintainer doesn't want, part 2
+.for opt in ${_ALL_EXCLUDE:O:u}
+PORT_OPTIONS:=		${PORT_OPTIONS:N${opt}}
+.endfor
+
 ## Now create the list of activated options
 .if defined(OPTIONS_OVERRIDE)
 # Special case $OPTIONS_OVERRIDE; if it is defined forget about anything done
Index: devel/cutter/Makefile
===================================================================
--- devel/cutter/Makefile
+++ devel/cutter/Makefile
@@ -28,7 +28,7 @@
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	GOFFICE SOUP LCOV
+OPTIONS_DEFINE=	GOFFICE SOUP LCOV NLS
 GOFFICE_DESC=	GOffice support
 SOUP_DESC=	libsoup support
 LCOV_DESC=	Force dependency on lcov
Index: emulators/vice/Makefile
===================================================================
--- emulators/vice/Makefile
+++ emulators/vice/Makefile
@@ -51,7 +51,7 @@
 		vice.1 xplus4.1 \
 		vice.1 xcbm2.1
 
-OPTIONS_DEFINE=	SDL ALSA PULSEAUDIO DOCS
+OPTIONS_DEFINE=	SDL ALSA PULSEAUDIO DOCS NLS
 OPTIONS_SINGLE=	GUI
 OPTIONS_SINGLE_GUI=	GNOMEUI3 GNOMEUI2 XAW
 OPTIONS_DEFAULT?=	GNOMEUI3 SDL ALSA
Index: graphics/gnash/Makefile
===================================================================
--- graphics/gnash/Makefile
+++ graphics/gnash/Makefile
@@ -56,7 +56,7 @@
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
-OPTIONS_DEFINE=	CYGNAL VAAPI DOCS
+OPTIONS_DEFINE=	CYGNAL VAAPI DOCS NLS
 OPTIONS_SINGLE=	MEDIA GUI RENDERER
 OPTIONS_SINGLE_MEDIA=	FFMPEG GSTREAMER
 OPTIONS_SINGLE_GUI=	GTK2 KDE4
Index: mail/drac/Makefile
===================================================================
--- mail/drac/Makefile
+++ mail/drac/Makefile
@@ -20,7 +20,7 @@
 USE_CSTD=	gnu89
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_DEFINE=		DB DOCS
+OPTIONS_DEFINE=		DB DOCS IPV6
 OPTIONS_RADIO=		MUA
 OPTIONS_RADIO_MUA=	POSTFIX EXIM
 POSTFIX_DESC=		Use POSTFIX
Index: multimedia/sabbu/Makefile
===================================================================
--- multimedia/sabbu/Makefile
+++ multimedia/sabbu/Makefile
@@ -24,7 +24,7 @@
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib
 LDFLAGS+=	-lswscale0 -lgmodule-2.0
 
-OPTIONS_DEFINE=	GTKSPELL
+OPTIONS_DEFINE=	GTKSPELL NLS
 OPTIONS_DEFAULT=GTKSPELL
 
 GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
Index: www/gurlchecker/Makefile
===================================================================
--- www/gurlchecker/Makefile
+++ www/gurlchecker/Makefile
@@ -15,7 +15,7 @@
 
 LIB_DEPENDS=	libgnet-2.0.so:net/gnet2
 
-OPTIONS_DEFINE=	CROCO TIDY CLAMAV GNUTLS
+OPTIONS_DEFINE=	CROCO TIDY CLAMAV GNUTLS NLS
 OPTIONS_DEFAULT=CLAMAV GNUTLS
 CROCO_DESC=	Library for CSS2 validation
 TIDY_DESC=	Library for HTML w3c validation
Index: x11-toolkits/gtk12/Makefile
===================================================================
--- x11-toolkits/gtk12/Makefile
+++ x11-toolkits/gtk12/Makefile
@@ -27,6 +27,8 @@
 
 INFO=		gdk gtk
 
+OPTIONS_DEFINE=	NLS
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}