diff --git a/lib/libnetbsd/Makefile.depend b/lib/libnetbsd/Makefile.depend
index cf2961c09880..18be76b0cb6f 100644
--- a/lib/libnetbsd/Makefile.depend
+++ b/lib/libnetbsd/Makefile.depend
@@ -1,14 +1,13 @@
 # $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
 	include \
 	include/xlocale \
-	lib/libutil \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
 .endif
diff --git a/lib/libnetbsd/Makefile.depend.options b/lib/libnetbsd/Makefile.depend.options
index 4dcc6c412671..95c6de3baf00 100644
--- a/lib/libnetbsd/Makefile.depend.options
+++ b/lib/libnetbsd/Makefile.depend.options
@@ -1,6 +1,7 @@
 DIRDEPS_OPTIONS = host_egacy
 
+DIRDEPS.host_egacy.no = lib/libutil
 DIRDEPS.host_egacy.yes = tools/build
 
 .include <dirdeps-options.mk>
 
diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk
index d0ae1c0171cb..f2328d6cd99c 100644
--- a/share/mk/local.dirdeps.mk
+++ b/share/mk/local.dirdeps.mk
@@ -1,231 +1,239 @@
 # $FreeBSD$
 .if !target(_DIRDEP_USE)
 # we are the 1st makefile
 
 .if !defined(MK_CLANG)
 .include "${SRCTOP}/share/mk/src.opts.mk"
 .endif
 
 # making universe is special
 .if defined(UNIVERSE_GUARD)
 # these should be done by now
 DIRDEPS_FILTER+= N*.host
 .endif
 
 # pseudo machines get no qualification
 .for m in host common
 M_dep_qual_fixes += C;($m),[^/.,]*$$;\1;
 .endfor
 #.info M_dep_qual_fixes=${M_dep_qual_fixes}
 
+# Some things we never want to build for host
+DIRDEPS_FILTER.host = \
+	Ninclude* \
+	Nlib/csu* \
+	Nlib/libc \
+	Nlib/[mn]* \
+	Ngnu/lib/lib[a-r]* \
+	Nsecure/lib* \
+	Nusr.bin/xinstall* \
+
+.if ${.MAKE.OS} == "FreeBSD"
+# Host libraries should mostly be excluded from the build so the
+# host version in /usr/lib is used.
+# Internal libraries need to be allowed to be built though
+# since they are never installed.
+
 # Cheat for including src.libnames.mk
 __<bsd.init.mk>__:
 # Pull in _INTERNALLIBS
 .include <src.libnames.mk>
 
-# Host libraries should mostly be excluded from the build so the
-# host version in /usr/lib is used.  Internal libraries need to be
-# allowed to be built though since they are never installed.
 _need_host_libs=
 .for lib in ${_INTERNALLIBS}
 _need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
 .endfor
+.if ${MK_host_egacy} == "yes"
+_need_host_libs+= lib/libmd
+.endif
 
 N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}}
-DIRDEPS_FILTER.host = \
-	${N_host_libs} \
-	Ninclude* \
-	Nlib/csu* \
-	Nlib/libc \
-	Nlib/[mn]* \
-	Ngnu/lib/lib[a-r]* \
-	Nsecure/lib* \
-	Nusr.bin/xinstall* \
-
+DIRDEPS_FILTER.host+= ${N_host_libs}
+.endif
 
 DIRDEPS_FILTER+= \
 	Nbin/cat.host \
 	${DIRDEPS_FILTER.xtras:U}
 
 # Cleanup a buildworld's WORLDTMP so that any files generated from it
 # or using it will rebuild with the DIRDEPS SYSROOT.  Otherwise existing
 # object .meta files may still reference those directories and not be
 # rebuilt and lead to incorrect Makefile.depend files due to lack of
 # .dirdep files.
 .if !defined(NO_CLEANUP_WORLDTMP) && exists(${OBJTOP}/tmp/_worldtmp)
 cleanup_worldtmp: .PHONY .NOMETA
 	@echo "Cleaning leftover WORLDTMP from buildworld."
 	-rm -rf ${OBJTOP}/tmp/*
 	-chflags -R 0 ${OBJTOP}/tmp/*
 	rm -rf ${OBJTOP}/tmp
 beforedirdeps: cleanup_worldtmp
 .endif
 
 # pseudo option for building host tools on old or non-FreeBSD host
 # allows us to leverage Makefile.depend.options with
 # DIRDEPS_OPTIONS = host_egacy
 # dirdeps-options.mk will qualify with ${DEP_MACHINE} (and others)
 # before looking at the bare option.
 MK_host_egacy.host= ${MK_host_egacy}
 
 .endif				# !target(_DIRDEP_USE)
 
 # reset this each time
 DIRDEPS_FILTER.xtras=
 .if ${DEP_MACHINE:Npkgs*} != ""
 DIRDEPS_FILTER.xtras+= Nusr.bin/clang/clang.host
 .endif
 
 .if ${DEP_MACHINE} != "host"
 MK_host_egacy.${DEP_MACHINE}= no
 
 # this is how we can handle optional dependencies
 .if ${DEP_RELDIR} == "lib/libc"
 DIRDEPS += lib/libc_nonshared
 .if ${MK_SSP:Uno} != "no" 
 DIRDEPS += lib/libssp_nonshared
 .endif
 .else
 DIRDEPS_FILTER.xtras+= Nlib/libc_nonshared
 .endif
 
 # some optional things
 .if ${MK_CTF} == "yes" && ${DEP_RELDIR:Mcddl/usr.bin/ctf*} == ""
 DIRDEPS += \
 	cddl/usr.bin/ctfconvert.host \
 	cddl/usr.bin/ctfmerge.host
 .endif
 
 # Add in proper libgcc (gnu or LLVM) if not building libcc and libc is needed.
 # Add both gcc_s and gcc_eh as dependencies as the decision to build
 # -static or not is not known here.
 .if ${DEP_RELDIR:M*libgcc*} == "" && ${DIRDEPS:U:Mlib/libc} != ""
 DIRDEPS+= \
 	lib/libgcc_eh \
 	lib/libgcc_s
 .endif
 
 # Bootstrap support.  Give hints to DIRDEPS if there is no Makefile.depend*
 # generated yet.  This can be based on things such as SRC files and LIBADD.
 # These hints will not factor into the final Makefile.depend as only what is
 # used will be added in and handled via [local.]gendirdeps.mk.  This is not
 # done for MACHINE=host builds.
 # XXX: Include this in local.autodep.mk as well for gendirdeps without filemon.
 # Only do this for main build target
 .if ${RELDIR} == ${DEP_RELDIR} && !defined(_RECURSING_PROGS)
 .for _depfile in ${.MAKE.DEPENDFILE_PREFERENCE:T}
 .if !defined(_have_depfile) && exists(${.CURDIR}/${_depfile})
 _have_depfile=
 .endif
 .endfor
 .if !defined(_have_depfile)
 # KMOD does not use any stdlibs.
 .if !defined(KMOD)
 # Gather PROGS dependencies first
 .if !empty(PROGS)
 _PROGS_LIBADD=
 _PROGS_DPADD=
 _PROGS_SRCS=
 .for _prog in ${PROGS}
 .for s in . _
 .if !empty(LIBADD${s}${_prog})
 _PROGS_LIBADD+=	${LIBADD${s}${_prog}}
 .endif
 .if !empty(DPADD${s}${_prog})
 _PROGS_DPADD+=	${DPADD${s}${_prog}}
 .endif
 .if !empty(SRCS${s}${_prog})
 _PROGS_SRCS+=	${SRCS${s}${_prog}}
 .endif
 .endfor	# .for s in . _
 # Add in assumed source (bsd.prog.mk)
 .if !target(${_prog})
 .if defined(PROG_CXX)
 _PROGS_SRCS+=	${_prog}.cc
 .else
 _PROGS_SRCS+=	${_prog}.c
 .endif
 .endif	# !target(${_prog})
 .endfor	# .for _prog in ${PROGS}
 .endif	# !empty(PROGS)
 _SRCS= ${SRCS} ${_PROGS_SRCS}
 
 # Has C files. The C_DIRDEPS are shared with C++ files as well.
 C_DIRDEPS= \
 	include \
 	include/arpa \
 	include/protocols \
 	include/rpc  \
 	include/rpcsvc \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 
 # libgcc is needed as well but is added later.
 
 .if ${MK_GSSAPI} != "no"
 C_DIRDEPS+=  include/gssapi
 .endif
 
 .if !empty(_SRCS:M*.c)
 DIRDEPS+= ${C_DIRDEPS}
 .endif
 # Has C++ files
 .if !empty(_SRCS:M*.cc) || !empty(_SRCS:M*.C) || !empty(_SRCS:M*.cpp) || \
     !empty(_SRCS:M*.cxx)
 DIRDEPS+= ${C_DIRDEPS}
 .if ${MK_CLANG} == "yes"
 DIRDEPS+= lib/libc++ lib/libcxxrt
 .endif
 # XXX: Clang and GCC always adds -lm currently, even when not needed.
 DIRDEPS+= lib/msun
 .endif	# CXX
 .endif	# !defined(KMOD)
 # Has yacc files.
 .if !empty(_SRCS:M*.y)
 DIRDEPS+=	usr.bin/yacc.host
 .endif
 _DPADD= ${DPADD} ${_PROGS_DPADD}
 .if !empty(_DPADD)
 # This only works for DPADD with full OBJ/SRC paths, which is mostly just
 # _INTERNALLIBS.
 _DP_DIRDEPS= \
 	${_DPADD:O:u:M${OBJTOP}*:H:N.:tA:C,${OBJTOP}[^/]*/,,:N.:O:u} \
 	${_DPADD:O:u:M${OBJROOT}*:N${OBJTOP}*:N${STAGE_ROOT}/*:H:S,${OBJROOT},,:C,^([^/]+)/(.*),\2.\1,:S,${HOST_TARGET}$,host,:N.*:O:u}
 # Resolve the paths to RELDIRs
 .if !empty(_DP_DIRDEPS)
 DIRDEPS+= ${_DP_DIRDEPS:C,^,${SRCTOP}/,:tA:C,^${SRCTOP}/,,}
 .endif
 .endif	# !empty(DPADD)
 _ALL_LIBADD= ${LIBADD} ${_PROGS_LIBADD}
 .if !empty(_ALL_LIBADD)
 # Also handle LIBADD for non-internal libraries.
 .for _lib in ${_ALL_LIBADD:O:u}
 _lib${_lib}reldir= ${LIB${_lib:tu}DIR:C,${OBJTOP}/,,}
 .if defined(LIB${_lib:tu}DIR) && ${DIRDEPS:M${_lib${_lib}reldir}} == "" && \
     exists(${SRCTOP}/${_lib${_lib}reldir})
 DIRDEPS+= ${_lib${_lib}reldir}
 .endif
 .endfor
 .endif	# !empty(LIBADD)
 .endif	# no Makefile.depend*
 .endif	# ${RELDIR} == ${DEP_RELDIR}
 
 .endif	# ${DEP_MACHINE} != "host"
 
 .if ${MK_STAGING} == "yes"
 # we need targets/pseudo/stage to prep the stage tree
 .if ${DEP_RELDIR:N.:N${SRCTOP}:N*pseudo/stage} != ""
 DIRDEPS += targets/pseudo/stage
 .endif
 .endif
 
 DEP_MACHINE_ARCH = ${MACHINE_ARCH.${DEP_MACHINE}}
 DEP_MACHINE_CPUARCH = ${DEP_MACHINE_ARCH:${__TO_CPUARCH}}
 CSU_DIR.${DEP_MACHINE_ARCH} ?= csu/${DEP_MACHINE_ARCH}
 CSU_DIR := ${CSU_DIR.${DEP_MACHINE_ARCH}}
 BOOT_MACHINE_DIR:= ${BOOT_MACHINE_DIR.${DEP_MACHINE}}
 KERNEL_NAME:= ${KERNEL_NAME.${DEP_MACHINE}}
 
 .-include <site.dirdeps.mk>
diff --git a/targets/pseudo/host-tools/Makefile.depend.host b/targets/pseudo/host-tools/Makefile.depend.host
index 39324fc6d49d..7ec04928d055 100644
--- a/targets/pseudo/host-tools/Makefile.depend.host
+++ b/targets/pseudo/host-tools/Makefile.depend.host
@@ -1,17 +1,17 @@
 DIRDEPS= \
+	sbin/md5 \
 	usr.bin/awk \
 	usr.bin/cap_mkdb \
 	usr.bin/file2c \
 	usr.bin/lex \
 	usr.bin/mkdep \
 	usr.bin/mkimg \
 	usr.bin/rpcgen \
 	usr.bin/sed \
 	usr.bin/tar \
 	usr.bin/yacc \
 	usr.sbin/makefs \
 	usr.sbin/nmtree \
 
-
 .include <dirdeps.mk>