diff --git a/bin/echo/Makefile.depend b/bin/echo/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/bin/echo/Makefile.depend
+++ b/bin/echo/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/bin/sleep/Makefile.depend b/bin/sleep/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/bin/sleep/Makefile.depend
+++ b/bin/sleep/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/rescue/rescue/Makefile.depend b/rescue/rescue/Makefile.depend
index 38219b53ac8..5debdae2f66 100644
--- a/rescue/rescue/Makefile.depend
+++ b/rescue/rescue/Makefile.depend
@@ -24,6 +24,7 @@ DIRDEPS = \
 	lib/libbz2 \
 	lib/libc \
 	lib/libcam \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libdevstat \
diff --git a/sbin/md5/Makefile.depend b/sbin/md5/Makefile.depend
index 064e492dd3e..8aac374844e 100644
--- a/sbin/md5/Makefile.depend
+++ b/sbin/md5/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 	lib/libmd \
 
diff --git a/usr.bin/basename/Makefile.depend b/usr.bin/basename/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/basename/Makefile.depend
+++ b/usr.bin/basename/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/cmp/Makefile.depend b/usr.bin/cmp/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/cmp/Makefile.depend
+++ b/usr.bin/cmp/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/col/Makefile.depend b/usr.bin/col/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/col/Makefile.depend
+++ b/usr.bin/col/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/dc/Makefile.depend b/usr.bin/dc/Makefile.depend
index 9d5105e918d..7e1b62db9b9 100644
--- a/usr.bin/dc/Makefile.depend
+++ b/usr.bin/dc/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 	secure/lib/libcrypto \
 	secure/lib/libssl \
diff --git a/usr.bin/dirname/Makefile.depend b/usr.bin/dirname/Makefile.depend
index 9cb890b5836..4def626103c 100644
--- a/usr.bin/dirname/Makefile.depend
+++ b/usr.bin/dirname/Makefile.depend
@@ -5,8 +5,10 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/elfdump/Makefile.depend b/usr.bin/elfdump/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/elfdump/Makefile.depend
+++ b/usr.bin/elfdump/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/fold/Makefile.depend b/usr.bin/fold/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/fold/Makefile.depend
+++ b/usr.bin/fold/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/getopt/Makefile.depend b/usr.bin/getopt/Makefile.depend
index 9cb890b5836..4def626103c 100644
--- a/usr.bin/getopt/Makefile.depend
+++ b/usr.bin/getopt/Makefile.depend
@@ -5,8 +5,10 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/jot/Makefile.depend b/usr.bin/jot/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/jot/Makefile.depend
+++ b/usr.bin/jot/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/kdump/Makefile.depend b/usr.bin/kdump/Makefile.depend
index 71c82136392..59ec51a9b1d 100644
--- a/usr.bin/kdump/Makefile.depend
+++ b/usr.bin/kdump/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcasper/libcasper \
 	lib/libcasper/services/cap_grp \
 	lib/libcasper/services/cap_pwd \
diff --git a/usr.bin/locate/bigram/Makefile.depend b/usr.bin/locate/bigram/Makefile.depend
index 9cb890b5836..4def626103c 100644
--- a/usr.bin/locate/bigram/Makefile.depend
+++ b/usr.bin/locate/bigram/Makefile.depend
@@ -5,8 +5,10 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/logname/Makefile.depend b/usr.bin/logname/Makefile.depend
index 9cb890b5836..4def626103c 100644
--- a/usr.bin/logname/Makefile.depend
+++ b/usr.bin/logname/Makefile.depend
@@ -5,8 +5,10 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/printenv/Makefile.depend b/usr.bin/printenv/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/printenv/Makefile.depend
+++ b/usr.bin/printenv/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/tee/Makefile.depend b/usr.bin/tee/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/tee/Makefile.depend
+++ b/usr.bin/tee/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/tr/Makefile.depend b/usr.bin/tr/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/tr/Makefile.depend
+++ b/usr.bin/tr/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/write/Makefile.depend b/usr.bin/write/Makefile.depend
index 3646e2e2b1a..4def626103c 100644
--- a/usr.bin/write/Makefile.depend
+++ b/usr.bin/write/Makefile.depend
@@ -8,6 +8,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.bin/yes/Makefile.depend b/usr.bin/yes/Makefile.depend
index 9cb890b5836..4def626103c 100644
--- a/usr.bin/yes/Makefile.depend
+++ b/usr.bin/yes/Makefile.depend
@@ -5,8 +5,10 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcapsicum \
 	lib/libcompiler_rt \
 
 
diff --git a/usr.sbin/daemon/Makefile.depend b/usr.sbin/daemon/Makefile.depend
index 0f77a15a871..58f9a3347b0 100644
--- a/usr.sbin/daemon/Makefile.depend
+++ b/usr.sbin/daemon/Makefile.depend
@@ -5,6 +5,7 @@ DIRDEPS = \
 	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
+	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \