Index: share/man/man5/src.conf.5
===================================================================
--- share/man/man5/src.conf.5
+++ share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" $FreeBSD$
-.Dd April 10, 2017
+.Dd April 18, 2017
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -697,19 +697,6 @@
 .Pp
 This is a default setting on
 amd64/amd64, arm/arm, arm/armeb, arm/armv6, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpcspe and sparc64/sparc64.
-.It Va WITHOUT_GNU
-Set to not build contributed GNU software as a part of the base system.
-This option can be useful if the system built must not contain any code
-covered by the GNU Public License due to legal reasons.
-.Bf -symbolic
-The option has no effect yet.
-.Ef
-When set, it enforces these options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_GNU_SUPPORT
-.El
 .It Va WITHOUT_GNUCXX
 Do not build the GNU C++ stack (g++, libstdc++).
 This is the default on platforms where clang is the system compiler.
@@ -733,8 +720,6 @@
 .It Va WITHOUT_GNU_GREP_COMPAT
 Set this option to omit the gnu extensions to grep from being included in
 BSD grep.
-.It Va WITHOUT_GNU_SUPPORT
-Set to build some programs without optional GNU support.
 .It Va WITHOUT_GPIO
 Set to not build
 .Xr gpioctl 8
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -97,7 +97,6 @@
     GAMES \
     GCOV \
     GDB \
-    GNU \
     GNU_DIFF \
     GNU_GREP \
     GNU_GREP_COMPAT \
@@ -443,7 +442,6 @@
 .for var in \
     BLACKLIST \
     BZIP2 \
-    GNU \
     INET \
     INET6 \
     KERBEROS \
Index: tools/build/options/WITHOUT_GNU
===================================================================
--- tools/build/options/WITHOUT_GNU
+++ /dev/null
@@ -1,7 +0,0 @@
-.\" $FreeBSD$
-Set to not build contributed GNU software as a part of the base system.
-This option can be useful if the system built must not contain any code
-covered by the GNU Public License due to legal reasons.
-.Bf -symbolic
-The option has no effect yet.
-.Ef
Index: tools/build/options/WITHOUT_GNU_SUPPORT
===================================================================
--- tools/build/options/WITHOUT_GNU_SUPPORT
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to build some programs without optional GNU support.