Index: gnu/usr.bin/binutils/Makefile
===================================================================
--- gnu/usr.bin/binutils/Makefile
+++ gnu/usr.bin/binutils/Makefile
@@ -6,19 +6,12 @@
 	libiberty \
 	libbfd \
 	libopcodes \
-	libbinutils \
 	as \
-	ld \
-	${_objcopy}
+	ld
 
-.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
-_objcopy=	objcopy
-.endif
 
-SUBDIR_DEPEND_libbinutils=libbfd		# for bfdver.h
 SUBDIR_DEPEND_as=libbfd libiberty libopcodes
 SUBDIR_DEPEND_ld=libbfd libiberty
-SUBDIR_DEPEND_objcopy=libbfd libiberty libbinutils
 
 .if !make(install)
 SUBDIR_PARALLEL=
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -81,7 +81,6 @@
     DYNAMICROOT \
     ED_CRYPTO \
     EE \
-    ELFCOPY_AS_OBJCOPY \
     ELFTOOLCHAIN_BOOTSTRAP \
     EXAMPLES \
     FDT \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -220,9 +220,6 @@
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/bin/ld.bfd
-.if ${MK_ELFCOPY_AS_OBJCOPY} == no
-OLD_FILES+=usr/bin/objcopy
-.endif
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
@@ -421,9 +418,6 @@
 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_ELFCOPY_AS_OBJCOPY} == no
-OLD_FILES+=usr/share/man/man1/objcopy.1.gz
-.endif
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
 OLD_FILES+=usr/share/man/man7/as.7.gz
 OLD_FILES+=usr/share/man/man7/ld.7.gz
@@ -8015,9 +8009,11 @@
 OLD_FILES+=usr/bin/c88
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/c++filt
+OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/bin/nm
+OLD_FILES+=usr/bin/objcopy
 OLD_FILES+=usr/bin/readelf
 OLD_FILES+=usr/bin/size
 OLD_FILES+=usr/bin/strings
@@ -8025,15 +8021,13 @@
 OLD_FILES+=usr/bin/yacc
 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/elfcopy.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
-.if ${MK_ELFCOPY_AS_OBJCOPY} != no
-OLD_FILES+=usr/bin/objcopy
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
-.endif
 OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
@@ -8343,10 +8337,6 @@
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc_tests
 OLD_DIRS+=usr/tests/usr.bin/yacc
 .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_ELFCOPY_AS_OBJCOPY
===================================================================
--- tools/build/options/WITHOUT_ELFCOPY_AS_OBJCOPY
+++ /dev/null
@@ -1,5 +0,0 @@
-.\" $FreeBSD$
-Set to build and install
-.Xr objcopy 1
-from GNU Binutils, instead of the one from ELF Tool Chain.
-This option is provided as a transition aid and will be removed in due time.
Index: tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
===================================================================
--- tools/build/options/WITH_ELFCOPY_AS_OBJCOPY
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to build and install ELF Tool Chain's elfcopy as
-.Xr objcopy 1 ,
-instead of the one from GNU Binutils.
Index: usr.bin/elfcopy/Makefile
===================================================================
--- usr.bin/elfcopy/Makefile
+++ usr.bin/elfcopy/Makefile
@@ -7,15 +7,11 @@
 
 .PATH: ${ELFCOPYDIR}
 
-.if ${MK_ELFCOPY_AS_OBJCOPY} != "no"
 PROG=	objcopy
 objcopy.1: elfcopy.1
 	sed -e 's/\.Dt ELFCOPY 1/.Dt OBJCOPY 1/' \
 	    -e 's/\.Nm elfcopy/.Nm objcopy/' < ${.ALLSRC} > ${.TARGET}
 CLEANFILES+= objcopy.1
-.else
-PROG=	elfcopy
-.endif
 
 SRCS=	archive.c ascii.c binary.c main.c pe.c sections.c segments.c symbols.c