diff --git a/share/mk/local.dirdeps-options.mk b/share/mk/local.dirdeps-options.mk
index 9e7f7bbd963c..4eef5311375e 100644
--- a/share/mk/local.dirdeps-options.mk
+++ b/share/mk/local.dirdeps-options.mk
@@ -24,4 +24,6 @@ DIRDEPS.OPENSSL.no+= lib/libmd
 DIRDEPS.PAM_SUPPORT.yes+= lib/libpam/libpam
 DIRDEPS.TCP_WRAPPERS.yes+= lib/libwrap
 
+MK_FDT.${DEP_MACHINE} ?= yes
+
 .-include <site.dirdeps-options.mk>
diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk
index 99782b856d41..2a92eea7455e 100644
--- a/share/mk/local.dirdeps.mk
+++ b/share/mk/local.dirdeps.mk
@@ -5,6 +5,10 @@
 .include "${SRCTOP}/share/mk/src.opts.mk"
 .endif
 
+# Machine-specific MK settings needed for Makefile.dirdeps.options usage
+MK_FDT.i386 = no
+MK_FDT.amd64 = no
+
 # making universe is special
 .if defined(UNIVERSE_GUARD)
 # these should be done by now
diff --git a/stand/efi/fdt/Makefile.depend b/stand/efi/fdt/Makefile.depend
index 15a1f9c07f7c..18537add9fe3 100644
--- a/stand/efi/fdt/Makefile.depend
+++ b/stand/efi/fdt/Makefile.depend
@@ -1,8 +1,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	include \
-	include/xlocale \
+	stand/libsa \
 
 
 .include <dirdeps.mk>
diff --git a/stand/efi/libefi/Makefile.depend b/stand/efi/libefi/Makefile.depend
index 18537add9fe3..8a29d17bb768 100644
--- a/stand/efi/libefi/Makefile.depend
+++ b/stand/efi/libefi/Makefile.depend
@@ -2,6 +2,7 @@
 
 DIRDEPS = \
 	stand/libsa \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/stand/efi/loader/Makefile.depend b/stand/efi/loader/Makefile.depend
index 96a148bee2d7..ae9e6b6efaa4 100644
--- a/stand/efi/loader/Makefile.depend
+++ b/stand/efi/loader/Makefile.depend
@@ -1,9 +1,10 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	bin/sh.host \
 	stand/efi/libefi \
-	stand/ficl \
 	stand/libsa \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/stand/efi/loader/Makefile.depend.arm b/stand/efi/loader/Makefile.depend.arm
index 8eb92e94c6e0..4ba1445d8a5f 100644
--- a/stand/efi/loader/Makefile.depend.arm
+++ b/stand/efi/loader/Makefile.depend.arm
@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
diff --git a/stand/efi/loader/Makefile.depend.arm64 b/stand/efi/loader/Makefile.depend.arm64
index 8eb92e94c6e0..4ba1445d8a5f 100644
--- a/stand/efi/loader/Makefile.depend.arm64
+++ b/stand/efi/loader/Makefile.depend.arm64
@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
diff --git a/stand/efi/loader/Makefile.depend.options b/stand/efi/loader/Makefile.depend.options
new file mode 100644
index 000000000000..20292bab9bcd
--- /dev/null
+++ b/stand/efi/loader/Makefile.depend.options
@@ -0,0 +1,7 @@
+# options that impact our dependencies
+DIRDEPS_OPTIONS = LOADER_LUA
+
+DIRDEPS.LOADER_LUA.yes += \
+	stand/liblua \
+
+.include <dirdeps-options.mk>
diff --git a/stand/efi/loader/Makefile.depend.riscv b/stand/efi/loader/Makefile.depend.riscv
new file mode 100644
index 000000000000..4ba1445d8a5f
--- /dev/null
+++ b/stand/efi/loader/Makefile.depend.riscv
@@ -0,0 +1,16 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	bin/sh.host \
+	stand/efi/fdt \
+	stand/efi/libefi \
+	stand/fdt \
+	stand/libsa \
+	usr.bin/awk.host \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/stand/fdt/Makefile.depend b/stand/fdt/Makefile.depend
index 15a1f9c07f7c..18537add9fe3 100644
--- a/stand/fdt/Makefile.depend
+++ b/stand/fdt/Makefile.depend
@@ -1,8 +1,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	include \
-	include/xlocale \
+	stand/libsa \
 
 
 .include <dirdeps.mk>
diff --git a/stand/ficl/Makefile.depend b/stand/ficl/Makefile.depend
index 18537add9fe3..8a29d17bb768 100644
--- a/stand/ficl/Makefile.depend
+++ b/stand/ficl/Makefile.depend
@@ -2,6 +2,7 @@
 
 DIRDEPS = \
 	stand/libsa \
+	usr.bin/awk.host \
 
 
 .include <dirdeps.mk>
diff --git a/stand/i386/libi386/Makefile.depend b/stand/i386/libi386/Makefile.depend
index 18537add9fe3..15a1f9c07f7c 100644
--- a/stand/i386/libi386/Makefile.depend
+++ b/stand/i386/libi386/Makefile.depend
@@ -1,7 +1,8 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	stand/libsa \
+	include \
+	include/xlocale \
 
 
 .include <dirdeps.mk>
diff --git a/stand/i386/loader/Makefile.depend b/stand/i386/loader/Makefile.depend
index 9262a05207b6..c687ef93d84e 100644
--- a/stand/i386/loader/Makefile.depend
+++ b/stand/i386/loader/Makefile.depend
@@ -1,7 +1,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	stand/ficl \
 	stand/i386/btx/btx \
 	stand/i386/btx/btxldr \
 	stand/i386/btx/lib \
diff --git a/stand/i386/loader/Makefile.depend.options b/stand/i386/loader/Makefile.depend.options
new file mode 100644
index 000000000000..7527fa4bda17
--- /dev/null
+++ b/stand/i386/loader/Makefile.depend.options
@@ -0,0 +1,10 @@
+DIRDEPS_OPTIONS = FORTH LOADER_LUA
+
+DIRDEPS.FORTH.yes += \
+	stand/ficl \
+
+DIRDEPS.LOADER_LUA.yes += \
+	stand/liblua \
+	stand/lua \
+
+.include <dirdeps-options.mk>
diff --git a/stand/i386/loader_lua/Makefile.depend b/stand/i386/loader_lua/Makefile.depend
new file mode 100644
index 000000000000..993ab0638f4a
--- /dev/null
+++ b/stand/i386/loader_lua/Makefile.depend
@@ -0,0 +1,11 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/stand/lua/Makefile.depend b/stand/lua/Makefile.depend
new file mode 100644
index 000000000000..11aba52f82cf
--- /dev/null
+++ b/stand/lua/Makefile.depend
@@ -0,0 +1,10 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/stand/powerpc/ofw/Makefile.depend b/stand/powerpc/ofw/Makefile.depend
new file mode 100644
index 000000000000..15a1f9c07f7c
--- /dev/null
+++ b/stand/powerpc/ofw/Makefile.depend
@@ -0,0 +1,12 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/stand/uboot/Makefile.depend.options b/stand/uboot/Makefile.depend.options
new file mode 100644
index 000000000000..d70bc7edd168
--- /dev/null
+++ b/stand/uboot/Makefile.depend.options
@@ -0,0 +1,9 @@
+DIRDEPS_OPTIONS = FORTH LOADER_LUA
+
+DIRDEPS.FORTH.yes += \
+	stand/ficl \
+
+DIRDEPS.LOADER_LUA.yes += \
+	stand/lua \
+
+.include <dirdeps-options.mk>
diff --git a/targets/pseudo/loader/Makefile b/targets/pseudo/loader/Makefile
new file mode 100644
index 000000000000..01b5f23410c8
--- /dev/null
+++ b/targets/pseudo/loader/Makefile
@@ -0,0 +1 @@
+.include "../Makefile.inc"
diff --git a/targets/pseudo/loader/Makefile.depend.amd64 b/targets/pseudo/loader/Makefile.depend.amd64
new file mode 100644
index 000000000000..8e9a786ba236
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.amd64
@@ -0,0 +1,7 @@
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/efi/loader \
+
+
+.include <dirdeps.mk>
diff --git a/targets/pseudo/loader/Makefile.depend.arm b/targets/pseudo/loader/Makefile.depend.arm
new file mode 100644
index 000000000000..d23148b537fe
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.arm
@@ -0,0 +1,8 @@
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/efi/loader \
+	stand/uboot \
+
+
+.include <dirdeps.mk>
diff --git a/targets/pseudo/loader/Makefile.depend.arm64 b/targets/pseudo/loader/Makefile.depend.arm64
new file mode 100644
index 000000000000..8e9a786ba236
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.arm64
@@ -0,0 +1,7 @@
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/efi/loader \
+
+
+.include <dirdeps.mk>
diff --git a/targets/pseudo/loader/Makefile.depend.i386 b/targets/pseudo/loader/Makefile.depend.i386
new file mode 100644
index 000000000000..29a2092b8203
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.i386
@@ -0,0 +1,7 @@
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/i386/loader \
+
+
+.include <dirdeps.mk>
diff --git a/targets/pseudo/loader/Makefile.depend.powerpc b/targets/pseudo/loader/Makefile.depend.powerpc
new file mode 100644
index 000000000000..6c481c73d253
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.powerpc
@@ -0,0 +1,7 @@
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/uboot \
+
+
+.include <dirdeps.mk>
diff --git a/targets/pseudo/loader/Makefile.depend.riscv b/targets/pseudo/loader/Makefile.depend.riscv
new file mode 100644
index 000000000000..8e9a786ba236
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.riscv
@@ -0,0 +1,7 @@
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/efi/loader \
+
+
+.include <dirdeps.mk>