diff --git a/share/mk/local.dirdeps-options.mk b/share/mk/local.dirdeps-options.mk
--- a/share/mk/local.dirdeps-options.mk
+++ b/share/mk/local.dirdeps-options.mk
@@ -25,4 +25,6 @@
 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
--- a/share/mk/local.dirdeps.mk
+++ b/share/mk/local.dirdeps.mk
@@ -6,6 +6,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
--- a/stand/efi/fdt/Makefile.depend
+++ b/stand/efi/fdt/Makefile.depend
@@ -2,8 +2,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
--- a/stand/efi/libefi/Makefile.depend
+++ b/stand/efi/libefi/Makefile.depend
@@ -3,6 +3,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
--- a/stand/efi/loader/Makefile.depend
+++ b/stand/efi/loader/Makefile.depend
@@ -2,9 +2,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.options b/stand/efi/loader/Makefile.depend.options
new file mode 100644
--- /dev/null
+++ b/stand/efi/loader/Makefile.depend.options
@@ -0,0 +1,15 @@
+
+DIRDEPS_OPTIONS = FDT FORTH LOADER_LUA
+
+DIRDEPS.FDT.yes += \
+	stand/fdt \
+	stand/efi/fdt \
+
+DIRDEPS.FORTH.yes += \
+	stand/ficl \
+
+DIRDEPS.LOADER_LUA.yes += \
+	stand/liblua \
+	stand/lua \
+
+.include <dirdeps-options.mk>
diff --git a/stand/fdt/Makefile.depend b/stand/fdt/Makefile.depend
--- a/stand/fdt/Makefile.depend
+++ b/stand/fdt/Makefile.depend
@@ -2,8 +2,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
--- a/stand/ficl/Makefile.depend
+++ b/stand/ficl/Makefile.depend
@@ -3,6 +3,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
--- a/stand/i386/libi386/Makefile.depend
+++ b/stand/i386/libi386/Makefile.depend
@@ -2,7 +2,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
--- a/stand/i386/loader/Makefile.depend
+++ b/stand/i386/loader/Makefile.depend
@@ -2,7 +2,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
--- /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/efi/libefi/Makefile.depend b/stand/liblua/Makefile.depend
copy from stand/efi/libefi/Makefile.depend
copy to stand/liblua/Makefile.depend
diff --git a/stand/ficl/Makefile.depend b/stand/lua/Makefile.depend
copy from stand/ficl/Makefile.depend
copy to stand/lua/Makefile.depend
--- a/stand/ficl/Makefile.depend
+++ b/stand/lua/Makefile.depend
@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	stand/libsa \
 
 
 .include <dirdeps.mk>
diff --git a/stand/efi/fdt/Makefile.depend b/stand/powerpc/ofw/Makefile.depend
copy from stand/efi/fdt/Makefile.depend
copy to stand/powerpc/ofw/Makefile.depend
diff --git a/stand/ficl/Makefile.depend b/stand/uboot/Makefile.depend
copy from stand/ficl/Makefile.depend
copy to stand/uboot/Makefile.depend
--- a/stand/ficl/Makefile.depend
+++ b/stand/uboot/Makefile.depend
@@ -2,6 +2,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	stand/fdt \
 	stand/libsa \
 
 
@@ -10,3 +11,4 @@
 .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
--- /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
--- /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
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.amd64
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+# 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
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.arm
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+# 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
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.arm64
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+# 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
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.i386
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/i386/loader \
+
+
+.include <dirdeps.mk>
diff --git a/targets/pseudo/loader/Makefile.depend.riscv b/targets/pseudo/loader/Makefile.depend.riscv
new file mode 100644
--- /dev/null
+++ b/targets/pseudo/loader/Makefile.depend.riscv
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+# This file is not autogenerated - take care!
+
+DIRDEPS = \
+	stand/efi/loader \
+
+
+.include <dirdeps.mk>