diff --git a/sbin/kldstat/Makefile.depend b/sbin/kldstat/Makefile.depend
index 0f77a15a871..58f9a3347b0 100644
--- a/sbin/kldstat/Makefile.depend
+++ b/sbin/kldstat/Makefile.depend
@@ -5,6 +5,7 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
diff --git a/sys/boot/geli/Makefile.depend b/sys/boot/geli/Makefile.depend
new file mode 100644
index 00000000000..7b5722492e1
--- /dev/null
+++ b/sys/boot/geli/Makefile.depend
@@ -0,0 +1,16 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/libmd \
+	lib/libstand \
+	secure/lib/libcrypto \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/sys/boot/i386/gptboot/Makefile.depend b/sys/boot/i386/gptboot/Makefile.depend
index c7986033d6f..295be1a66f9 100644
--- a/sys/boot/i386/gptboot/Makefile.depend
+++ b/sys/boot/i386/gptboot/Makefile.depend
@@ -3,6 +3,10 @@
 
 DIRDEPS = \
 	include \
+	include/xlocale \
+	lib/libmd \
+	lib/libstand \
+	sys/boot/geli \
 	sys/boot/i386/btx/btx \
 	sys/boot/i386/btx/lib \
 	sys/boot/libstand32 \
diff --git a/sys/boot/i386/gptzfsboot/Makefile.depend b/sys/boot/i386/gptzfsboot/Makefile.depend
index 63a43d89fad..295be1a66f9 100644
--- a/sys/boot/i386/gptzfsboot/Makefile.depend
+++ b/sys/boot/i386/gptzfsboot/Makefile.depend
@@ -4,6 +4,9 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
+	lib/libmd \
+	lib/libstand \
+	sys/boot/geli \
 	sys/boot/i386/btx/btx \
 	sys/boot/i386/btx/lib \
 	sys/boot/libstand32 \
diff --git a/sys/boot/i386/libi386/Makefile.depend b/sys/boot/i386/libi386/Makefile.depend
index 18be76b0cb6..df20c96b20e 100644
--- a/sys/boot/i386/libi386/Makefile.depend
+++ b/sys/boot/i386/libi386/Makefile.depend
@@ -4,6 +4,7 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
+	lib/libmd \
 
 
 .include <dirdeps.mk>
diff --git a/sys/boot/i386/loader/Makefile.depend b/sys/boot/i386/loader/Makefile.depend
index 9650fc0a18d..89d542286ee 100644
--- a/sys/boot/i386/loader/Makefile.depend
+++ b/sys/boot/i386/loader/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/libstand \
 	sys/boot/ficl32 \
+	sys/boot/geli \
 	sys/boot/i386/btx/btx \
 	sys/boot/i386/btx/btxldr \
 	sys/boot/i386/btx/lib \
diff --git a/sys/boot/i386/zfsloader/Makefile.depend b/sys/boot/i386/zfsloader/Makefile.depend
index b3810a273c9..15b0c98bfa4 100644
--- a/sys/boot/i386/zfsloader/Makefile.depend
+++ b/sys/boot/i386/zfsloader/Makefile.depend
@@ -6,6 +6,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/libstand \
 	sys/boot/ficl32 \
+	sys/boot/geli \
 	sys/boot/i386/btx/btx \
 	sys/boot/i386/btx/btxldr \
 	sys/boot/i386/btx/lib \
diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend
index c186f6d4681..b0423a50b1e 100644
--- a/targets/pseudo/userland/misc/Makefile.depend
+++ b/targets/pseudo/userland/misc/Makefile.depend
@@ -32,6 +32,7 @@ DIRDEPS+= \
 
 DIRDEPS.x86sys= \
 	sys/boot/efi/libefi \
+	sys/boot/geli \
 	sys/boot/i386/boot0 \
 	sys/boot/i386/boot0sio \
 	sys/boot/i386/boot2 \