diff --git a/lib/libnandfs/Makefile.depend b/lib/libnandfs/Makefile.depend
new file mode 100644
index 000000000000..3646e2e2b1af
--- /dev/null
+++ b/lib/libnandfs/Makefile.depend
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/nandfs/Makefile.depend b/sbin/nandfs/Makefile.depend
new file mode 100644
index 000000000000..b17f6d6fc6ed
--- /dev/null
+++ b/sbin/nandfs/Makefile.depend
@@ -0,0 +1,19 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libnandfs \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sbin/newfs_nandfs/Makefile.depend b/sbin/newfs_nandfs/Makefile.depend
new file mode 100644
index 000000000000..851372cfd559
--- /dev/null
+++ b/sbin/newfs_nandfs/Makefile.depend
@@ -0,0 +1,21 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libexpat \
+	lib/libgeom \
+	lib/libsbuf \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend
index a31f646fd886..bb00e6f61f00 100644
--- a/targets/pseudo/userland/Makefile.depend
+++ b/targets/pseudo/userland/Makefile.depend
@@ -1,895 +1,904 @@
 # $FreeBSD$
 
 # This file is not autogenerated - take care!
 
 .if !defined(MK_MANDOCDB)
 .include <src.opts.mk>
 .endif
 
 DIRDEPS=
 .if ${MK_MANDOCDB} == "no"
 DIRDEPS+= usr.bin/makewhatis
 .endif
 DIRDEPS+= \
 	bin/cat \
 	bin/chflags \
 	bin/chio \
 	bin/chmod \
 	bin/cp \
 	bin/csh \
 	bin/date \
 	bin/dd \
 	bin/df \
 	bin/domainname \
 	bin/echo \
 	bin/ed \
 	bin/expr \
 	bin/freebsd-version \
 	bin/getfacl \
 	bin/hostname \
 	bin/kenv \
 	bin/kill \
 	bin/ln \
 	bin/ls \
 	bin/mkdir \
 	bin/mv \
 	bin/pax \
 	bin/pkill \
 	bin/ps \
 	bin/pwait \
 	bin/pwd \
 	bin/rcp \
 	bin/realpath \
 	bin/rm \
 	bin/rmail \
 	bin/rmdir \
 	bin/setfacl \
 	bin/sh \
 	bin/sleep \
 	bin/stty \
 	bin/sync \
 	bin/test \
 	bin/uuidgen \
 	sbin/adjkerntz \
 	sbin/atacontrol \
 	sbin/atm/atmconfig \
 	sbin/badsect \
 	sbin/camcontrol \
 	sbin/ccdconfig \
 	sbin/clri \
 	sbin/comcontrol \
 	sbin/conscontrol \
 	sbin/ddb \
 	sbin/devd \
 	sbin/devfs \
 	sbin/dhclient \
 	sbin/dmesg \
 	sbin/dump \
 	sbin/dumpfs \
 	sbin/dumpon \
 	sbin/etherswitchcfg \
 	sbin/ffsinfo \
 	sbin/fsck \
 	sbin/fsck_ffs \
 	sbin/fsck_msdosfs \
 	sbin/fsdb \
 	sbin/fsirand \
 	sbin/gbde \
 	sbin/geom/class/cache \
 	sbin/geom/class/concat \
 	sbin/geom/class/eli \
 	sbin/geom/class/journal \
 	sbin/geom/class/label \
 	sbin/geom/class/mirror \
 	sbin/geom/class/mountver \
 	sbin/geom/class/multipath \
 	sbin/geom/class/nop \
 	sbin/geom/class/part \
 	sbin/geom/class/raid \
 	sbin/geom/class/raid3 \
 	sbin/geom/class/sched \
 	sbin/geom/class/shsec \
 	sbin/geom/class/stripe \
 	sbin/geom/class/virstor \
 	sbin/geom/core \
 	sbin/ggate/ggatec \
 	sbin/ggate/ggated \
 	sbin/ggate/ggatel \
 	sbin/growfs \
 	sbin/gvinum \
 	sbin/hastctl \
 	sbin/hastd \
 	sbin/ifconfig \
 	sbin/init \
 	sbin/ipf/ipf \
 	sbin/ipf/ipfs \
 	sbin/ipf/ipfstat \
 	sbin/ipf/ipftest \
 	sbin/ipf/ipmon \
 	sbin/ipf/ipnat \
 	sbin/ipf/ippool \
 	sbin/ipf/ipresend \
 	sbin/ipf/libipf \
 	sbin/ipfw \
 	sbin/iscontrol \
 	sbin/kldconfig \
 	sbin/kldload \
 	sbin/kldstat \
 	sbin/kldunload \
 	sbin/ldconfig \
 	sbin/md5 \
 	sbin/mdconfig \
 	sbin/mdmfs \
 	sbin/mknod \
 	sbin/mksnap_ffs \
 	sbin/mount \
 	sbin/mount_cd9660 \
 	sbin/mount_fusefs \
 	sbin/mount_msdosfs \
 	sbin/mount_nfs \
 	sbin/mount_nullfs \
 	sbin/mount_udf \
 	sbin/mount_unionfs \
 	sbin/natd \
 	sbin/newfs \
 	sbin/newfs_msdos \
 	sbin/nfsiod \
 	sbin/nos-tun \
 	sbin/pfctl \
 	sbin/pflogd \
 	sbin/ping \
 	sbin/ping6 \
 	sbin/quotacheck \
 	sbin/rcorder \
 	sbin/reboot \
 	sbin/recoverdisk \
 	sbin/resolvconf \
 	sbin/restore \
 	sbin/route \
 	sbin/routed \
 	sbin/routed/rtquery \
 	sbin/rtsol \
 	sbin/savecore \
 	sbin/setkey \
 	sbin/shutdown \
 	sbin/spppcontrol \
 	sbin/swapon \
 	sbin/sysctl \
 	sbin/tunefs \
 	sbin/umount \
 	usr.bin/alias \
 	usr.bin/apply \
 	usr.bin/ar \
 	usr.bin/asa \
 	usr.bin/at \
 	usr.bin/atf/atf-config \
 	usr.bin/atf/atf-report \
 	usr.bin/atf/atf-run \
 	usr.bin/atf/atf-version \
 	usr.bin/atm/sscop \
 	usr.bin/awk \
 	usr.bin/banner \
 	usr.bin/basename \
 	usr.bin/bc \
 	usr.bin/biff \
 	usr.bin/bluetooth/bthost \
 	usr.bin/bluetooth/btsockstat \
 	usr.bin/bluetooth/rfcomm_sppd \
 	usr.bin/bmake \
 	usr.bin/brandelf \
 	usr.bin/bsdiff/bsdiff \
 	usr.bin/bsdiff/bspatch \
 	usr.bin/bzip2 \
 	usr.bin/bzip2recover \
 	usr.bin/c89 \
 	usr.bin/c99 \
 	usr.bin/calendar \
 	usr.bin/cap_mkdb \
 	usr.bin/catman \
 	usr.bin/chat \
 	usr.bin/checknr \
 	usr.bin/chkey \
 	usr.bin/chpass \
 	usr.bin/cksum \
 	usr.bin/cmp \
 	usr.bin/col \
 	usr.bin/colcrt \
 	usr.bin/colldef \
 	usr.bin/colrm \
 	usr.bin/column \
 	usr.bin/comm \
 	usr.bin/compile_et \
 	usr.bin/compress \
 	usr.bin/cpio \
 	usr.bin/cpuset \
 	usr.bin/csplit \
 	usr.bin/csup \
 	usr.bin/ctags \
 	usr.bin/ctlstat \
 	usr.bin/cut \
 	usr.bin/dc \
 	usr.bin/dig \
 	usr.bin/dirname \
 	usr.bin/dpv \
 	usr.bin/drill \
 	usr.bin/du \
 	usr.bin/ee \
 	usr.bin/elf2aout \
 	usr.bin/elfdump \
 	usr.bin/enigma \
 	usr.bin/env \
 	usr.bin/expand \
 	usr.bin/false \
 	usr.bin/fetch \
 	usr.bin/file \
 	usr.bin/file2c \
 	usr.bin/find \
 	usr.bin/finger \
 	usr.bin/fmt \
 	usr.bin/fold \
 	usr.bin/from \
 	usr.bin/fstat \
 	usr.bin/fsync \
 	usr.bin/ftp \
 	usr.bin/gcore \
 	usr.bin/gencat \
 	usr.bin/getconf \
 	usr.bin/getent \
 	usr.bin/getopt \
 	usr.bin/gprof \
 	usr.bin/grep \
 	usr.bin/gzip \
 	usr.bin/head \
 	usr.bin/hexdump \
 	usr.bin/host \
 	usr.bin/iconv \
 	usr.bin/id \
 	usr.bin/ident \
 	usr.bin/indent \
 	usr.bin/ipcrm \
 	usr.bin/ipcs \
 	usr.bin/iscsictl \
 	usr.bin/join \
 	usr.bin/jot \
 	usr.bin/kdump \
 	usr.bin/keylogin \
 	usr.bin/keylogout \
 	usr.bin/killall \
 	usr.bin/ktrace \
 	usr.bin/ktrdump \
 	usr.bin/lam \
 	usr.bin/last \
 	usr.bin/lastcomm \
 	usr.bin/lex \
 	usr.bin/ldd \
 	usr.bin/leave \
 	usr.bin/less \
 	usr.bin/lessecho \
 	usr.bin/lesskey \
 	usr.bin/lex/lib \
 	usr.bin/limits \
 	usr.bin/locale \
 	usr.bin/locate/bigram \
 	usr.bin/locate/code \
 	usr.bin/locate/locate \
 	usr.bin/lock \
 	usr.bin/lockf \
 	usr.bin/logger \
 	usr.bin/login \
 	usr.bin/logins \
 	usr.bin/logname \
 	usr.bin/look \
 	usr.bin/lorder \
 	usr.bin/lsvfs \
 	usr.bin/lzmainfo \
 	usr.bin/m4 \
 	usr.bin/mail \
 	usr.bin/man \
 	usr.bin/mandoc \
 	usr.bin/mesg \
 	usr.bin/minigzip \
 	usr.bin/ministat \
 	usr.bin/mkcsmapper \
 	usr.bin/mkdep \
 	usr.bin/mkesdb \
 	usr.bin/mkfifo \
 	usr.bin/mkimg \
 	usr.bin/mklocale \
 	usr.bin/mkstr \
 	usr.bin/mktemp \
 	usr.bin/mkulzma \
 	usr.bin/mkuzip \
 	usr.bin/msgs \
 	usr.bin/mt \
 	usr.bin/nc \
 	usr.bin/ncal \
 	usr.bin/netstat \
 	usr.bin/newgrp \
 	usr.bin/newkey \
 	usr.bin/nfsstat \
 	usr.bin/nice \
 	usr.bin/nl \
 	usr.bin/nohup \
 	usr.bin/nslookup \
 	usr.bin/nsupdate \
 	usr.bin/numactl \
 	usr.bin/opieinfo \
 	usr.bin/opiekey \
 	usr.bin/opiepasswd \
 	usr.bin/pagesize \
 	usr.bin/passwd \
 	usr.bin/paste \
 	usr.bin/patch \
 	usr.bin/pathchk \
 	usr.bin/perror \
 	usr.bin/pr \
 	usr.bin/printenv \
 	usr.bin/printf \
 	usr.bin/procstat \
 	usr.bin/protect \
 	usr.bin/quota \
 	usr.bin/rctl \
 	usr.bin/renice \
 	usr.bin/rev \
 	usr.bin/revoke \
 	usr.bin/rlogin \
 	usr.bin/rpcgen \
 	usr.bin/rpcinfo \
 	usr.bin/rs \
 	usr.bin/rsh \
 	usr.bin/rup \
 	usr.bin/ruptime \
 	usr.bin/rusers \
 	usr.bin/rwall \
 	usr.bin/rwho \
 	usr.bin/script \
 	usr.bin/sed \
 	usr.bin/send-pr \
 	usr.bin/seq \
 	usr.bin/shar \
 	usr.bin/showmount \
 	usr.bin/smbutil \
 	usr.bin/sockstat \
 	usr.bin/soelim \
 	usr.bin/sort \
 	usr.bin/split \
 	usr.bin/ssh-copy-id \
 	usr.bin/stat \
 	usr.bin/stdbuf \
 	usr.bin/su \
 	usr.bin/svn/svn \
 	usr.bin/svn/svnadmin \
 	usr.bin/svn/svnbench \
 	usr.bin/svn/svndumpfilter \
 	usr.bin/svn/svnfsfs \
 	usr.bin/svn/svnlook \
 	usr.bin/svn/svnmucc \
 	usr.bin/svn/svnrdump \
 	usr.bin/svn/svnserve \
 	usr.bin/svn/svnsync \
 	usr.bin/svn/svnversion \
 	usr.bin/systat \
 	usr.bin/tabs \
 	usr.bin/tail \
 	usr.bin/talk \
 	usr.bin/tar \
 	usr.bin/tcopy \
 	usr.bin/tee \
 	usr.bin/telnet \
 	usr.bin/tftp \
 	usr.bin/time \
 	usr.bin/timeout \
 	usr.bin/tip/tip \
 	usr.bin/top \
 	usr.bin/touch \
 	usr.bin/tput \
 	usr.bin/tr \
 	usr.bin/true \
 	usr.bin/truncate \
 	usr.bin/truss \
 	usr.bin/tset \
 	usr.bin/tsort \
 	usr.bin/tty \
 	usr.bin/ul \
 	usr.bin/uname \
 	usr.bin/unexpand \
 	usr.bin/unifdef \
 	usr.bin/uniq \
 	usr.bin/units \
 	usr.bin/unvis \
 	usr.bin/unzip \
 	usr.bin/usbhidaction \
 	usr.bin/usbhidctl \
 	usr.bin/users \
 	usr.bin/uudecode \
 	usr.bin/uuencode \
 	usr.bin/vacation \
 	usr.bin/vgrind \
 	usr.bin/vi \
 	usr.bin/vi/catalog \
 	usr.bin/vis \
 	usr.bin/vmstat \
 	usr.bin/vtfontcvt \
 	usr.bin/w \
 	usr.bin/wall \
 	usr.bin/wc \
 	usr.bin/what \
 	usr.bin/whereis \
 	usr.bin/which \
 	usr.bin/who \
 	usr.bin/whois \
 	usr.bin/write \
 	usr.bin/xargs \
 	usr.bin/xinstall \
 	usr.bin/xlint/lint1 \
 	usr.bin/xlint/lint2 \
 	usr.bin/xlint/llib \
 	usr.bin/xlint/xlint \
 	usr.bin/xo \
 	usr.bin/xstr \
 	usr.bin/xz \
 	usr.bin/xzdec \
 	usr.bin/yacc \
 	usr.bin/yes \
 	usr.bin/ypcat \
 	usr.bin/ypmatch \
 	usr.bin/ypwhich \
 	usr.sbin/IPXrouted \
 	usr.sbin/ac \
 	usr.sbin/accton \
 	usr.sbin/adduser \
 	usr.sbin/amd/amd \
 	usr.sbin/amd/amq \
 	usr.sbin/amd/doc \
 	usr.sbin/amd/fixmount \
 	usr.sbin/amd/fsinfo \
 	usr.sbin/amd/hlfsd \
 	usr.sbin/amd/include \
 	usr.sbin/amd/libamu \
 	usr.sbin/amd/mk-amd-map \
 	usr.sbin/amd/pawd \
 	usr.sbin/amd/scripts \
 	usr.sbin/amd/wire-test \
 	usr.sbin/ancontrol \
 	usr.sbin/apm \
 	usr.sbin/arp \
 	usr.sbin/arpaname \
 	usr.sbin/audit \
 	usr.sbin/auditd \
 	usr.sbin/auditdistd \
 	usr.sbin/auditreduce \
 	usr.sbin/authpf \
 	usr.sbin/autofs \
 	usr.sbin/binmiscctl \
 	usr.sbin/bluetooth/ath3kfw \
 	usr.sbin/bluetooth/bcmfw \
 	usr.sbin/bluetooth/bt3cfw \
 	usr.sbin/bluetooth/bthidcontrol \
 	usr.sbin/bluetooth/bthidd \
 	usr.sbin/bluetooth/btpand \
 	usr.sbin/bluetooth/hccontrol \
 	usr.sbin/bluetooth/hcsecd \
 	usr.sbin/bluetooth/hcseriald \
 	usr.sbin/bluetooth/l2control \
 	usr.sbin/bluetooth/l2ping \
 	usr.sbin/bluetooth/rfcomm_pppd \
 	usr.sbin/bluetooth/sdpcontrol \
 	usr.sbin/bluetooth/sdpd \
 	usr.sbin/bootparamd/bootparamd \
 	usr.sbin/bootparamd/callbootd \
 	usr.sbin/bsdconfig \
 	usr.sbin/bsdconfig/console \
 	usr.sbin/bsdconfig/console/include \
 	usr.sbin/bsdconfig/diskmgmt \
 	usr.sbin/bsdconfig/diskmgmt/include \
 	usr.sbin/bsdconfig/docsinstall \
 	usr.sbin/bsdconfig/docsinstall/include \
 	usr.sbin/bsdconfig/dot \
 	usr.sbin/bsdconfig/dot/include \
 	usr.sbin/bsdconfig/examples \
 	usr.sbin/bsdconfig/include \
 	usr.sbin/bsdconfig/includes \
 	usr.sbin/bsdconfig/includes/include \
 	usr.sbin/bsdconfig/mouse \
 	usr.sbin/bsdconfig/mouse/include \
 	usr.sbin/bsdconfig/networking \
 	usr.sbin/bsdconfig/networking/include \
 	usr.sbin/bsdconfig/networking/share \
 	usr.sbin/bsdconfig/packages \
 	usr.sbin/bsdconfig/packages/include \
 	usr.sbin/bsdconfig/password \
 	usr.sbin/bsdconfig/password/include \
 	usr.sbin/bsdconfig/password/share \
 	usr.sbin/bsdconfig/security \
 	usr.sbin/bsdconfig/security/include \
 	usr.sbin/bsdconfig/share \
 	usr.sbin/bsdconfig/share/media \
 	usr.sbin/bsdconfig/share/packages \
 	usr.sbin/bsdconfig/startup \
 	usr.sbin/bsdconfig/startup/include \
 	usr.sbin/bsdconfig/startup/share \
 	usr.sbin/bsdconfig/timezone \
 	usr.sbin/bsdconfig/timezone/include \
 	usr.sbin/bsdconfig/timezone/share \
 	usr.sbin/bsdconfig/ttys \
 	usr.sbin/bsdconfig/ttys/include \
 	usr.sbin/bsdconfig/usermgmt \
 	usr.sbin/bsdconfig/usermgmt/include \
 	usr.sbin/bsdconfig/usermgmt/share \
 	usr.sbin/bsdinstall/distextract \
 	usr.sbin/bsdinstall/distfetch \
 	usr.sbin/bsdinstall/partedit \
 	usr.sbin/bsdinstall/scripts \
 	usr.sbin/bsnmpd/bsnmpd \
 	usr.sbin/bsnmpd/gensnmptree \
 	usr.sbin/bsnmpd/modules/snmp_atm \
 	usr.sbin/bsnmpd/modules/snmp_bridge \
 	usr.sbin/bsnmpd/modules/snmp_hast \
 	usr.sbin/bsnmpd/modules/snmp_hostres \
 	usr.sbin/bsnmpd/modules/snmp_lm75 \
 	usr.sbin/bsnmpd/modules/snmp_mibII \
 	usr.sbin/bsnmpd/modules/snmp_netgraph \
 	usr.sbin/bsnmpd/modules/snmp_pf \
 	usr.sbin/bsnmpd/modules/snmp_target \
 	usr.sbin/bsnmpd/modules/snmp_usm \
 	usr.sbin/bsnmpd/modules/snmp_vacm \
 	usr.sbin/bsnmpd/modules/snmp_wlan \
 	usr.sbin/bsnmpd/tools/bsnmptools \
 	usr.sbin/bsnmpd/tools/libbsnmptools \
 	usr.sbin/burncd \
 	usr.sbin/cdcontrol \
 	usr.sbin/chkgrp \
 	usr.sbin/chown \
 	usr.sbin/chroot \
 	usr.sbin/ckdist \
 	usr.sbin/clear_locks \
 	usr.sbin/config \
 	usr.sbin/crashinfo \
 	usr.sbin/cron/cron \
 	usr.sbin/cron/crontab \
 	usr.sbin/cron/lib \
 	usr.sbin/crunch/crunchgen \
 	usr.sbin/crunch/crunchide \
 	usr.sbin/ctladm \
 	usr.sbin/ctld \
 	usr.sbin/ctm/ctm \
 	usr.sbin/ctm/ctm_dequeue \
 	usr.sbin/ctm/ctm_rmail \
 	usr.sbin/ctm/ctm_smail \
 	usr.sbin/daemon \
 	usr.sbin/dconschat \
 	usr.sbin/ddns-confgen \
 	usr.sbin/devctl \
 	usr.sbin/devinfo \
 	usr.sbin/digictl \
 	usr.sbin/diskinfo \
 	usr.sbin/dnssec-dsfromkey \
 	usr.sbin/dnssec-keyfromlabel \
 	usr.sbin/dnssec-keygen \
 	usr.sbin/dnssec-revoke \
 	usr.sbin/dnssec-settime \
 	usr.sbin/dnssec-signzone \
 	usr.sbin/dumpcis \
 	usr.sbin/editmap \
 	usr.sbin/edquota \
 	usr.sbin/etcupdate \
 	usr.sbin/extattr \
 	usr.sbin/extattrctl \
 	usr.sbin/fdcontrol \
 	usr.sbin/fdformat \
 	usr.sbin/fdread \
 	usr.sbin/fdwrite \
 	usr.sbin/fifolog/fifolog_create \
 	usr.sbin/fifolog/fifolog_reader \
 	usr.sbin/fifolog/fifolog_writer \
 	usr.sbin/fifolog/lib \
 	usr.sbin/flowctl \
 	usr.sbin/fmtree \
 	usr.sbin/freebsd-update \
 	usr.sbin/fstyp \
 	usr.sbin/ftp-proxy \
 	usr.sbin/fwcontrol \
 	usr.sbin/genrandom \
 	usr.sbin/getfmac \
 	usr.sbin/getpmac \
 	usr.sbin/gpioctl \
 	usr.sbin/gssd \
 	usr.sbin/gstat \
 	usr.sbin/i2c \
 	usr.sbin/ifmcstat \
 	usr.sbin/inetd \
 	usr.sbin/iostat \
 	usr.sbin/iovctl \
 	usr.sbin/ip6addrctl \
 	usr.sbin/ipfwpcap \
 	usr.sbin/isc-hmac-fixup \
 	usr.sbin/iscsid \
 	usr.sbin/isfctl \
 	usr.sbin/jail \
 	usr.sbin/jexec \
 	usr.sbin/jls \
 	usr.sbin/kbdcontrol \
 	usr.sbin/kbdmap \
 	usr.sbin/keyserv \
 	usr.sbin/kldxref \
 	usr.sbin/lastlogin \
 	usr.sbin/lmcconfig \
 	usr.sbin/lpr/chkprintcap \
 	usr.sbin/lpr/common_source \
 	usr.sbin/lpr/filters \
 	usr.sbin/lpr/filters.ru/koi2855 \
 	usr.sbin/lpr/filters.ru/koi2alt \
 	usr.sbin/lpr/lp \
 	usr.sbin/lpr/lpc \
 	usr.sbin/lpr/lpd \
 	usr.sbin/lpr/lpq \
 	usr.sbin/lpr/lpr \
 	usr.sbin/lpr/lprm \
 	usr.sbin/lpr/lptest \
 	usr.sbin/lpr/pac \
 	usr.sbin/mailstats \
 	usr.sbin/mailwrapper \
 	usr.sbin/makefs \
 	usr.sbin/makemap \
 	usr.sbin/manctl \
 	usr.sbin/memcontrol \
 	usr.sbin/mergemaster \
 	usr.sbin/mfiutil \
 	usr.sbin/mixer \
 	usr.sbin/mld6query \
 	usr.sbin/mlxcontrol \
 	usr.sbin/mount_smbfs \
 	usr.sbin/mountd \
 	usr.sbin/moused \
 	usr.sbin/mpsutil \
 	usr.sbin/mptutil \
 	usr.sbin/mtest \
 	usr.sbin/named \
 	usr.sbin/named-checkconf \
 	usr.sbin/named-checkzone \
 	usr.sbin/named-journalprint \
 	usr.sbin/ndp \
 	usr.sbin/newsyslog \
 	usr.sbin/nfscbd \
 	usr.sbin/nfsd \
 	usr.sbin/nfsdumpstate \
 	usr.sbin/nfsrevoke \
 	usr.sbin/nfsuserd \
 	usr.sbin/ngctl \
 	usr.sbin/nghook \
 	usr.sbin/nmtree \
 	usr.sbin/nologin \
 	usr.sbin/nscd \
 	usr.sbin/nsec3hash \
 	usr.sbin/ntp/doc \
 	usr.sbin/ntp/doc/drivers/icons \
 	usr.sbin/ntp/doc/drivers/scripts \
 	usr.sbin/ntp/doc/drivers \
 	usr.sbin/ntp/doc/hints \
 	usr.sbin/ntp/doc/icons \
 	usr.sbin/ntp/doc/pic \
 	usr.sbin/ntp/doc/scripts \
 	usr.sbin/ntp/libntp \
 	usr.sbin/ntp/libopts \
 	usr.sbin/ntp/libparse \
 	usr.sbin/ntp/ntp-keygen \
 	usr.sbin/ntp/ntpd \
 	usr.sbin/ntp/ntpdate \
 	usr.sbin/ntp/ntpdc \
 	usr.sbin/ntp/ntpq \
 	usr.sbin/ntp/ntptime \
 	usr.sbin/ntp/sntp \
 	usr.sbin/pc-sysinstall/backend \
 	usr.sbin/pc-sysinstall/backend-partmanager \
 	usr.sbin/pc-sysinstall/backend-query \
 	usr.sbin/pc-sysinstall/conf \
 	usr.sbin/pc-sysinstall/doc \
 	usr.sbin/pc-sysinstall/examples \
 	usr.sbin/pc-sysinstall/pc-sysinstall \
 	usr.sbin/pciconf \
 	usr.sbin/periodic \
 	usr.sbin/pkg \
 	usr.sbin/pkg_install/add \
 	usr.sbin/pkg_install/create \
 	usr.sbin/pkg_install/delete \
 	usr.sbin/pkg_install/info \
 	usr.sbin/pkg_install/lib \
 	usr.sbin/pkg_install/updating \
 	usr.sbin/pkg_install/version \
 	usr.sbin/pmcannotate \
 	usr.sbin/pmccontrol \
 	usr.sbin/pmcstat \
 	usr.sbin/portsnap/make_index \
 	usr.sbin/portsnap/phttpget \
 	usr.sbin/portsnap/portsnap \
 	usr.sbin/powerd \
 	usr.sbin/ppp \
 	usr.sbin/pppctl \
 	usr.sbin/praliases \
 	usr.sbin/praudit \
 	usr.sbin/procctl \
 	usr.sbin/pstat \
 	usr.sbin/pw \
 	usr.sbin/pwd_mkdb \
 	usr.sbin/quot \
 	usr.sbin/quotaon \
 	usr.sbin/rarpd \
 	usr.sbin/repquota \
 	usr.sbin/rip6query \
 	usr.sbin/rmt \
 	usr.sbin/rndc \
 	usr.sbin/rndc-confgen \
 	usr.sbin/route6d \
 	usr.sbin/rpc.lockd \
 	usr.sbin/rpc.statd \
 	usr.sbin/rpc.umntall \
 	usr.sbin/rpc.yppasswdd \
 	usr.sbin/rpc.ypupdated \
 	usr.sbin/rpc.ypxfrd \
 	usr.sbin/rpcbind \
 	usr.sbin/rrenumd \
 	usr.sbin/rtadvctl \
 	usr.sbin/rtadvd \
 	usr.sbin/rtprio \
 	usr.sbin/rtsold \
 	usr.sbin/rwhod \
 	usr.sbin/sa \
 	usr.sbin/sendmail \
 	usr.sbin/service \
 	usr.sbin/services_mkdb \
 	usr.sbin/sesutil \
 	usr.sbin/setfib \
 	usr.sbin/setfmac \
 	usr.sbin/setpmac \
 	usr.sbin/smbmsg \
 	usr.sbin/snapinfo \
 	usr.sbin/spray \
 	usr.sbin/syslogd \
 	usr.sbin/sysrc \
 	usr.sbin/tcpdchk \
 	usr.sbin/tcpdmatch \
 	usr.sbin/tcpdrop \
 	usr.sbin/tcpdump/tcpdump \
 	usr.sbin/timed/timed \
 	usr.sbin/timed/timedc \
 	usr.sbin/traceroute \
 	usr.sbin/traceroute6 \
 	usr.sbin/trpt \
 	usr.sbin/tzsetup \
 	usr.sbin/uathload \
 	usr.sbin/uefisign \
 	usr.sbin/ugidfw \
 	usr.sbin/uhsoctl \
 	usr.sbin/unbound/anchor \
 	usr.sbin/unbound/checkconf \
 	usr.sbin/unbound/control \
 	usr.sbin/unbound/daemon \
 	usr.sbin/unbound/local-setup \
 	usr.sbin/usbconfig \
 	usr.sbin/usbdump \
 	usr.sbin/utx \
 	usr.sbin/vidcontrol \
 	usr.sbin/vigr \
 	usr.sbin/vipw \
 	usr.sbin/wake \
 	usr.sbin/watch \
 	usr.sbin/watchdogd \
 	usr.sbin/wlandebug \
 	usr.sbin/wpa/hostapd \
 	usr.sbin/wpa/hostapd_cli \
 	usr.sbin/wpa/ndis_events \
 	usr.sbin/wpa/wpa_cli \
 	usr.sbin/wpa/wpa_passphrase \
 	usr.sbin/wpa/wpa_supplicant \
 	usr.sbin/yp_mkdb \
 	usr.sbin/ypbind \
 	usr.sbin/yppoll \
 	usr.sbin/yppush \
 	usr.sbin/ypserv \
 	usr.sbin/ypset \
 	usr.sbin/zic/zdump \
 	usr.sbin/zic/zic \
 	${DEP_RELDIR}/cddl \
 	${DEP_RELDIR}/games \
 	${DEP_RELDIR}/gnu \
 	${DEP_RELDIR}/include \
 	${DEP_RELDIR}/kerberos5 \
 	${DEP_RELDIR}/lib \
 	${DEP_RELDIR}/libexec \
 	${DEP_RELDIR}/misc \
 	${DEP_RELDIR}/secure \
 	${DEP_RELDIR}/share \
 
+.if ${MK_NAND} != "no"
+DIRDEPS+= \
+	sbin/nandfs \
+	sbin/newfs_nandfs \
+	usr.sbin/nandsim \
+	usr.sbin/nandtool \
+
+.endif
+
 DIRDEPS.amd64= \
 	sbin/bsdlabel \
 	sbin/fdisk \
 	sbin/nvmecontrol \
 	usr.sbin/acpi/acpiconf \
 	usr.sbin/acpi/acpidb \
 	usr.sbin/acpi/acpidump \
 	usr.sbin/acpi/iasl \
 	usr.sbin/apm \
 	usr.sbin/asf \
 	usr.sbin/bhyve \
 	usr.sbin/bhyvectl \
 	usr.sbin/bhyveload \
 	usr.sbin/boot0cfg \
 	usr.sbin/btxld \
 	usr.sbin/cpucontrol \
 	usr.sbin/hyperv/tools \
 	usr.sbin/kgmon \
 	usr.sbin/lptcontrol \
 	usr.sbin/mptable \
 	usr.sbin/ndiscvt \
 	usr.sbin/sicontrol \
 	usr.sbin/spkrtest \
 	usr.sbin/sade \
 	usr.sbin/zzz
 
 DIRDEPS.arm= \
 	sbin/bsdlabel \
 	sbin/fdisk \
 	usr.sbin/ofwdump \
 	usr.sbin/kgmon
 
 DIRDEPS.i386= \
 	sbin/bsdlabel \
 	sbin/fdisk \
 	sbin/nvmecontrol \
 	sbin/sconfig \
 	usr.sbin/apm \
 	usr.sbin/apmd \
 	usr.sbin/asf \
 	usr.sbin/btxld \
 	usr.sbin/cpucontrol \
 	usr.sbin/hyperv/tools \
 	usr.sbin/kgmon \
 	usr.sbin/kgzip \
 	usr.sbin/lptcontrol \
 	usr.sbin/mptable \
 	usr.sbin/ndiscvt \
 	usr.sbin/pnpinfo \
 	usr.sbin/sade \
 	usr.sbin/sicontrol \
 	usr.sbin/spkrtest \
 	usr.sbin/zzz \
 	usr.sbin/acpi \
 	usr.sbin/boot0cfg \
 	usr.sbin/wlconfig
 
 DIRDEPS.arm64= \
 	usr.sbin/acpi \
 	usr.sbin/ofwdump
 
 DIRDEPS.mips= \
 	sbin/bsdlabel \
 	sbin/fdisk
 
 DIRDEPS.pc98= \
 	sbin/bsdlabel \
 	sbin/fdisk_pc98 \
 	sbin/sconfig
 
 DIRDEPS.sparc64= \
 	sbin/bsdlabel \
 	sbin/sunlabel \
 	usr.sbin/eeprom \
 	usr.sbin/ofwdump \
 	usr.sbin/sade
 
 DIRDEPS.powerpc= \
 	usr.sbin/nvram \
 	usr.sbin/ofwdump
 
 .if ${MK_GPL_DTC} != "yes"
 DIRDEPS+= usr.bin/dtc
 .endif
 
 .if ${MK_CASPER} == "yes"
 DIRDEPS+= sbin/casperd
 .endif
 
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}
 
 
 .include <dirdeps.mk>
diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend
index 2cbde23a47e9..c5e2407ddc18 100644
--- a/targets/pseudo/userland/lib/Makefile.depend
+++ b/targets/pseudo/userland/lib/Makefile.depend
@@ -1,183 +1,187 @@
 # $FreeBSD$
 
 # This file is not autogenerated - take care!
 
 .if !defined(MK_CLANG)
 .include <src.opts.mk>
 .endif
 
 DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/atf/libatf-c \
 	lib/atf/libatf-c++ \
 	lib/lib80211 \
 	lib/libalias/libalias \
 	lib/libalias/modules/cuseeme \
 	lib/libalias/modules/dummy \
 	lib/libalias/modules/ftp \
 	lib/libalias/modules/irc \
 	lib/libalias/modules/nbt \
 	lib/libalias/modules/pptp \
 	lib/libalias/modules/skinny \
 	lib/libalias/modules/smedia \
 	lib/libarchive \
 	lib/libauditd \
 	lib/libbegemot \
 	lib/libblocksruntime \
 	lib/libbluetooth \
 	lib/libbsdstat \
 	lib/libbsm \
 	lib/libbsnmp/libbsnmp \
 	lib/libbz2 \
 	lib/libc \
 	lib/libc++ \
 	lib/libcalendar \
 	lib/libcam \
 	lib/libcasper \
 	lib/libcom_err/doc \
 	lib/libcompat \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libcuse \
 	lib/libcxxrt \
 	lib/libdevctl \
 	lib/libdevinfo \
 	lib/libdevstat \
 	lib/libdwarf \
 	lib/libedit/edit/readline \
 	lib/libelf \
 	lib/libevent \
 	lib/libexecinfo \
 	lib/libexpat \
 	lib/libfetch \
 	lib/libgeom \
 	lib/libgssapi \
 	lib/libiconv_modules/BIG5 \
 	lib/libiconv_modules/DECHanyu \
 	lib/libiconv_modules/EUC \
 	lib/libiconv_modules/EUCTW \
 	lib/libiconv_modules/GBK2K \
 	lib/libiconv_modules/HZ \
 	lib/libiconv_modules/ISO2022 \
 	lib/libiconv_modules/JOHAB \
 	lib/libiconv_modules/MSKanji \
 	lib/libiconv_modules/UES \
 	lib/libiconv_modules/UTF1632 \
 	lib/libiconv_modules/UTF7 \
 	lib/libiconv_modules/UTF8 \
 	lib/libiconv_modules/VIQR \
 	lib/libiconv_modules/ZW \
 	lib/libiconv_modules/iconv_none \
 	lib/libiconv_modules/iconv_std \
 	lib/libiconv_modules/mapper_646 \
 	lib/libiconv_modules/mapper_none \
 	lib/libiconv_modules/mapper_parallel \
 	lib/libiconv_modules/mapper_serial \
 	lib/libiconv_modules/mapper_std \
 	lib/libiconv_modules/mapper_zone \
 	lib/libipsec \
 	lib/libipx \
 	lib/libjail \
 	lib/libkiconv \
 	lib/libkvm \
 	lib/libldns \
 	lib/liblzma \
 	lib/libmagic \
 	lib/libmandoc \
 	lib/libmd \
 	lib/libmemstat \
 	lib/libmilter \
 	lib/libmp \
 	lib/libnetgraph \
 	lib/libngatm \
 	lib/libnv \
 	lib/libopie \
 	lib/libpam/libpam \
 	lib/libpam/modules/pam_chroot \
 	lib/libpam/modules/pam_deny \
 	lib/libpam/modules/pam_echo \
 	lib/libpam/modules/pam_exec \
 	lib/libpam/modules/pam_ftpusers \
 	lib/libpam/modules/pam_group \
 	lib/libpam/modules/pam_guest \
 	lib/libpam/modules/pam_krb5 \
 	lib/libpam/modules/pam_ksu \
 	lib/libpam/modules/pam_lastlog \
 	lib/libpam/modules/pam_login_access \
 	lib/libpam/modules/pam_nologin \
 	lib/libpam/modules/pam_opie \
 	lib/libpam/modules/pam_opieaccess \
 	lib/libpam/modules/pam_passwdqc \
 	lib/libpam/modules/pam_permit \
 	lib/libpam/modules/pam_radius \
 	lib/libpam/modules/pam_rhosts \
 	lib/libpam/modules/pam_rootok \
 	lib/libpam/modules/pam_securetty \
 	lib/libpam/modules/pam_self \
 	lib/libpam/modules/pam_ssh \
 	lib/libpam/modules/pam_tacplus \
 	lib/libpam/modules/pam_unix \
 	lib/libpcap \
 	lib/libpjdlog \
 	lib/libpmc \
 	lib/libproc \
 	lib/libprocstat \
 	lib/libradius \
 	lib/librpcsec_gss \
 	lib/librpcsvc \
 	lib/librt \
 	lib/librtld_db \
 	lib/libsbuf \
 	lib/libsdp \
 	lib/libsm \
 	lib/libsmb \
 	lib/libsmdb \
 	lib/libsmutil \
 	lib/libstand \
 	lib/libstdbuf \
 	lib/libstdthreads \
 	lib/libtacplus \
 	lib/libtelnet \
 	lib/libthr \
 	lib/libthread_db \
 	lib/libufs \
 	lib/libugidfw \
 	lib/libulog \
 	lib/libunbound \
 	lib/libusb \
 	lib/libusbhid \
 	lib/libutil \
 	lib/libvgl \
 	lib/libvmmapi \
 	lib/libwrap \
 	lib/liby \
 	lib/libyaml \
 	lib/libypclnt \
 	lib/libz \
 	lib/msun \
 	lib/ncurses/form \
 	lib/ncurses/formw \
 	lib/ncurses/menu \
 	lib/ncurses/menuw \
 	lib/ncurses/ncurses \
 	lib/ncurses/ncursesw \
 	lib/ncurses/panel \
 	lib/ncurses/panelw \
 
 .if ${MK_CLANG} != "no" && \
     (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
     (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb") || \
     (${MACHINE_CPUARCH} == "i386"))
 DIRDEPS+= \
 	lib/libclang_rt/asan-preinit \
 	lib/libclang_rt/asan \
 	lib/libclang_rt/asan_cxx \
 	lib/libclang_rt/include \
 	lib/libclang_rt/profile \
 	lib/libclang_rt/safestack \
 	lib/libclang_rt/ubsan_standalone \
 	lib/libclang_rt/ubsan_standalone_cxx \
 
 .endif
 
+.if ${MK_NAND} != "no"
+DIRDEPS+= lib/libnandfs
+.endif
+
 .include <dirdeps.mk>
diff --git a/usr.sbin/nandsim/Makefile.depend b/usr.sbin/nandsim/Makefile.depend
new file mode 100644
index 000000000000..3646e2e2b1af
--- /dev/null
+++ b/usr.sbin/nandsim/Makefile.depend
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/usr.sbin/nandtool/Makefile.depend b/usr.sbin/nandtool/Makefile.depend
new file mode 100644
index 000000000000..851372cfd559
--- /dev/null
+++ b/usr.sbin/nandtool/Makefile.depend
@@ -0,0 +1,21 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	gnu/lib/csu \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libexpat \
+	lib/libgeom \
+	lib/libsbuf \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif