diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1412,10 +1412,17 @@
 _sysctl=sysctl
 .endif
 
+_strip=strip
+# If we aren't building a bootstrap strip, we have to link to the explicitly
+# passed XSTRIPBIN variable, otherwise installworld fails due to missing strip.
+.if ${MK_LLVM_BINUTILS_BOOTSTRAP} == "no" && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
+_strip=${XSTRIPBIN}
+.endif
+
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown cmp cp \
 	date echo egrep find grep id install \
 	ln make mkdir mtree mv pwd_mkdb \
-	rm sed services_mkdb sh sort strip ${_sysctl} test time true uname wc
+	rm sed services_mkdb sh sort ${_strip} ${_sysctl} test time true uname wc
 
 .if ${MK_ZONEINFO} != "no"
 ITOOLS+=tzsetup
diff --git a/usr.bin/elfcopy/Makefile b/usr.bin/elfcopy/Makefile
--- a/usr.bin/elfcopy/Makefile
+++ b/usr.bin/elfcopy/Makefile
@@ -10,7 +10,10 @@
 PROG=	elfcopy
 MAN=	elfcopy.1
 
-.if ${MK_LLVM_BINUTILS} == "no"
+# We create elftoolchain strip/objcopy links if we are bootstrapping without
+# LLVM binutils or if we are building world without LLVM binutils.
+.if (defined(BOOTSTRAPPING) && ${MK_LLVM_BINUTILS_BOOTSTRAP} == "no") || \
+    (!defined(BOOTSTRAPPING) && ${MK_LLVM_BINUTILS} == "no")
 
 LINKS+=	${BINDIR}/${PROG} ${BINDIR}/objcopy
 LINKS+=	${BINDIR}/${PROG} ${BINDIR}/strip