Index: gnu/usr.bin/Makefile
===================================================================
--- gnu/usr.bin/Makefile
+++ gnu/usr.bin/Makefile
@@ -2,10 +2,6 @@
 
 .include <src.opts.mk>
 
-SUBDIR= diff \
-	diff3 \
-	grep
-
 SUBDIR_DEPEND_gdb= ${_binutils}
 
 .if ${MK_CXX} != "no"
@@ -17,6 +13,8 @@
 SUBDIR.${MK_DIALOG}+=	dialog
 SUBDIR.${MK_GCC}+=	cc
 SUBDIR.${MK_GDB}+=	gdb
+SUBDIR.${MK_GNU_DIFF}+=	diff diff3
+SUBDIR.${MK_GNU_GREP}+=	grep
 SUBDIR.${MK_GPL_DTC}+=	dtc
 SUBDIR.${MK_TESTS}+=	tests
 
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -98,6 +98,8 @@
     GCOV \
     GDB \
     GNU \
+    GNU_DIFF \
+    GNU_GREP \
     GNU_GREP_COMPAT \
     GPIO \
     GROFF \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -2173,6 +2173,39 @@
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
+.if ${MK_GNU_DIFF} == no
+OLD_FILES+=usr/bin/diff
+OLD_FILES+=usr/bin/diff3
+OLD_FILES+=usr/share/man/man1/diff.1.gz
+OLD_FILES+=usr/share/man/man1/diff3.1.gz
+OLD_FILES+=usr/share/man/man7/diff.7.gz
+.endif
+
+.if ${MK_GNU_GREP} == no
+OLD_FILES+=usr/bin/gnugrep
+OLD_FILES+=usr/share/man/man1/gnugrep.1.gz
+.if ${MK_BSD_GREP} == no
+OLD_FILES+=usr/bin/bzgrep
+OLD_FILES+=usr/bin/bzegrep
+OLD_FILES+=usr/bin/bzfgrep
+OLD_FILES+=usr/bin/egrep
+OLD_FILES+=usr/bin/fgrep
+OLD_FILES+=usr/bin/grep
+OLD_FILES+=usr/bin/zegrep
+OLD_FILES+=usr/bin/zfgrep
+OLD_FILES+=usr/bin/zgrep
+OLD_FILES+=usr/share/man/man1/bzegrep.1.gz
+OLD_FILES+=usr/share/man/man1/bzfgrep.1.gz
+OLD_FILES+=usr/share/man/man1/bzgrep.1.gz
+OLD_FILES+=usr/share/man/man1/egrep.1.gz
+OLD_FILES+=usr/share/man/man1/fgrep.1.gz
+OLD_FILES+=usr/share/man/man1/grep.1.gz
+OLD_FILES+=usr/share/man/man1/zegrep.1.gz
+OLD_FILES+=usr/share/man/man1/zfgrep.1.gz
+OLD_FILES+=usr/share/man/man1/zgrep.1.gz
+.endif
+.endif
+
 # Also includes vgrind(1)
 .if ${MK_GROFF} == no
 OLD_FILES+=usr/bin/addftinfo
Index: tools/build/options/WITHOUT_GNU_DIFF
===================================================================
--- /dev/null
+++ tools/build/options/WITHOUT_GNU_DIFF
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build GNU
+.Xr diff 1
+and
+.Xr diff3 1 .
Index: tools/build/options/WITHOUT_GNU_GREP
===================================================================
--- /dev/null
+++ tools/build/options/WITHOUT_GNU_GREP
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build GNU
+.Xr grep 1 .