Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1482,7 +1482,7 @@
 .if ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_TOOLCHAIN} != "no"
 _elftctools=	lib/libelftc \
 		usr.bin/elfcopy \
 		usr.bin/nm \
@@ -1492,7 +1492,7 @@
 # cross-build on a FreeBSD 10 host:
 _elftctools+=	usr.bin/addr2line
 .endif
-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_TOOLCHAIN} != "no"
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \
Index: gnu/usr.bin/binutils/Makefile
===================================================================
--- gnu/usr.bin/binutils/Makefile
+++ gnu/usr.bin/binutils/Makefile
@@ -12,7 +12,7 @@
 	${_objcopy} \
 	objdump \
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "no" || ${MK_ELFCOPY_AS_OBJCOPY} == "no"
+.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
 _objcopy=	objcopy
 .endif
 
Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -182,7 +182,7 @@
 _cuse=		libcuse
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_TOOLCHAIN} != "no"
 _libelftc=	libelftc
 .endif
 
Index: targets/pseudo/toolchain/Makefile.depend
===================================================================
--- targets/pseudo/toolchain/Makefile.depend
+++ targets/pseudo/toolchain/Makefile.depend
@@ -9,7 +9,7 @@
 .endif
 DIRDEPS=
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "yes"
+.if ${MK_TOOLCHAIN} == "yes"
 DIRDEPS+= \
 	usr.bin/addr2line \
 	usr.bin/cxxflit \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -184,7 +184,7 @@
 .if ${MK_BINUTILS} == no
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
 OLD_FILES+=usr/bin/objcopy
 .endif
 OLD_FILES+=usr/bin/objdump
@@ -203,7 +203,7 @@
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.1.gz
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 .endif
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
@@ -1647,29 +1647,6 @@
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no || \
-    (${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} != no)
-OLD_FILES+=usr/bin/elfcopy
-OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
-.endif
-
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no
-OLD_FILES+=usr/bin/addr2line
-OLD_FILES+=usr/bin/c++filt
-OLD_FILES+=usr/bin/nm
-OLD_FILES+=usr/bin/readelf
-OLD_FILES+=usr/bin/size
-OLD_FILES+=usr/bin/strings
-OLD_FILES+=usr/bin/strip
-OLD_FILES+=usr/share/man/man1/addr2line.1.gz
-OLD_FILES+=usr/share/man/man1/c++filt.1.gz
-OLD_FILES+=usr/share/man/man1/nm.1.gz
-OLD_FILES+=usr/share/man/man1/readelf.1.gz
-OLD_FILES+=usr/share/man/man1/size.1.gz
-OLD_FILES+=usr/share/man/man1/strings.1.gz
-OLD_FILES+=usr/share/man/man1/strip.1.gz
-.endif
-
 #.if ${MK_EXAMPLES} == no
 # to be filled in
 #.endif
@@ -7524,8 +7501,25 @@
 .endif
 
 #.if ${MK_TOOLCHAIN} == no
-# to be filled in
+OLD_FILES+=usr/bin/addr2line
+OLD_FILES+=usr/bin/c++filt
+OLD_FILES+=usr/bin/nm
+OLD_FILES+=usr/bin/readelf
+OLD_FILES+=usr/bin/size
+OLD_FILES+=usr/bin/strings
+OLD_FILES+=usr/bin/strip
+OLD_FILES+=usr/share/man/man1/addr2line.1.gz
+OLD_FILES+=usr/share/man/man1/c++filt.1.gz
+OLD_FILES+=usr/share/man/man1/nm.1.gz
+OLD_FILES+=usr/share/man/man1/readelf.1.gz
+OLD_FILES+=usr/share/man/man1/size.1.gz
+OLD_FILES+=usr/share/man/man1/strings.1.gz
+OLD_FILES+=usr/share/man/man1/strip.1.gz
 #.endif
+.if ${MK_TOOLCHAIN} == no || ${MK_ELFCOPY_AS_OBJCOPY} != no
+OLD_FILES+=usr/bin/elfcopy
+OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
+.endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
Index: tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
===================================================================
--- tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
+++ /dev/null
@@ -1,10 +0,0 @@
-.\" $FreeBSD$
-Set to avoid building ELF Tool Chain tools
-.Xr addr2line 1 ,
-.Xr c++filt 1 ,
-.Xr nm 1 ,
-.Xr readelf 1 ,
-.Xr size 1 ,
-.Xr strings 1 ,
-and
-.Xr strip 1 .
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -237,7 +237,7 @@
 SUBDIR+=	ee
 .endif
 
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_TOOLCHAIN} != "no"
 _addr2line=	addr2line
 _cxxfilt=	cxxfilt
 _elfcopy=	elfcopy