Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1697,7 +1697,7 @@
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
-	
+
 .endfor
 	@seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \
 	  echo -n ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, "; \
@@ -2361,6 +2361,7 @@
 ${_bt}-links: ${_bt}-link-${_tool}
 .endfor
 
+_elftoolchain_libs+= lib/libzstd
 
 bootstrap-tools: ${_bt}-links .PHONY
 
Index: tools/build/Makefile
===================================================================
--- tools/build/Makefile
+++ tools/build/Makefile
@@ -120,10 +120,18 @@
 # Create all the directories that are needed during the legacy, bootstrap-tools
 # and cross-tools stages. We do this here using mkdir since mtree may not exist
 # yet (this happens if we are crossbuilding from Linux/Mac).
+INSTALLDIR_LIST= \
+	bin \
+	lib/casper \
+	lib/geom \
+	usr/include \
+	usr/include/casper \
+	usr/include/private/zstd \
+	usr/lib \
+
 installdirs:
-.for _dir in bin usr/lib usr/include usr/include/casper lib/geom lib/casper
-	mkdir -p "${DESTDIR}/${_dir}"
-.endfor
+	mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}
+
 # Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a
 # bootstrap tool was added to WORLTMP with a symlink or by building it in the
 # bootstrap-tools phase. We could also overrride BINDIR when building bootstrap