diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 5eabea923cb..8c333be4820 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -49,6 +49,12 @@
                 ..
                 krb5
                     plugins
+                        kdb
+                        ..
+                        preauth
+                        ..
+                        tls
+                        ..
                     ..
                 ..
                 libxo
@@ -57,6 +63,8 @@
                 ..
                 ossl-modules
                 ..
+                virtual_oss
+                ..
             ..
             libexec
                 bsdinstall
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index bb1e40e69ba..884a5aba18f 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -85,6 +85,8 @@
     cddl
         lib
         ..
+        oclo
+        ..
         sbin
         ..
         usr.bin
@@ -461,6 +463,8 @@
         ..
         libutil
         ..
+        libutil++
+        ..
         libxo
         ..
         msun