diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 6ba632894ca7..95a3361b3c61 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,145 +1,147 @@
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
-    bin
+    bin     tags=package=runtime
     ..
+/set tags=package=bootloader
     boot
         defaults
         ..
         dtb
             allwinner       tags=package=runtime
             ..
             overlays        tags=package=runtime
             ..
             rockchip        tags=package=runtime
             ..
         ..
         efi
         ..
         firmware
         ..
         fonts
         ..
         images
         ..
         kernel
         ..
-        loader.conf.d   tags=package=bootloader
+        loader.conf.d
         ..
         lua
         ..
         modules
         ..
         uboot
         ..
         zfs
         ..
     ..
+/unset tags
     dev             mode=0555 tags=package=runtime
     ..
-    etc
-        X11
+    etc                 tags=package=runtime
+        X11             tags=package=runtime
         ..
-        authpf
+        authpf          tags=package=pf
         ..
-        autofs
+        autofs          tags=package=autofs
         ..
-        bluetooth
+        bluetooth       tags=package=bluetooth
         ..
-        cron.d
+        cron.d          tags=package=cron
         ..
-        defaults
+        defaults        tags=package=runtime
         ..
-        devd
+        devd            tags=package=devd
         ..
-        dma
+        dma             tags=package=dma
         ..
-        gss
+        gss             tags=package=runtime
         ..
-        jail.conf.d
+        jail.conf.d     tags=package=jail
         ..
         kyua            tags=package=tests
         ..
-        mail
+        mail            tags=package=runtime
         ..
-        mtree
+        mtree           tags=package=mtree
         ..
-        newsyslog.conf.d
+        newsyslog.conf.d tags=package=newsyslog
         ..
-        ntp             mode=0700
+        ntp             mode=0700 tags=package=ntp
         ..
-        pam.d
+        pam.d           tags=package=runtime
         ..
-        periodic
-            daily
+        periodic        tags=package=periodic
+            daily       tags=package=periodic
             ..
-            monthly
+            monthly     tags=package=periodic
             ..
-            security
+            security    tags=package=periodic
             ..
-            weekly
+            weekly      tags=package=periodic
             ..
         ..
-        pkg
+        pkg             tags=package=pkg-bootstrap
         ..
-        ppp
+        ppp             tags=package=ppp
         ..
-        profile.d
+        profile.d       tags=package=runtime
         ..
-        rc.conf.d
+        rc.conf.d       tags=package=rc
         ..
-        rc.d
+        rc.d            tags=package=rc
         ..
-        security
+        security        tags=package=audit
         ..
-        ssh
+        ssh             tags=package=ssh
         ..
-        ssl
+        ssl             tags=package=caroot
             certs		tags=package=caroot
             ..
             untrusted		tags=package=caroot
             ..
         ..
-        sysctl.kld.d
+        sysctl.kld.d    tags=package=runtime
         ..
-        syslog.d
+        syslog.d        tags=package=syslogd
         ..
-        zfs			tags=package=zfs
-            compatibility.d
+        zfs                     tags=package=zfs
+            compatibility.d     tags=package=zfs
             ..
         ..
     ..
-    lib
-        geom
+    lib                 tags=package=clibs
+        geom            tags=package=geom
         ..
-        nvmecontrol
+        nvmecontrol     tags=package=nvme-tools
         ..
     ..
-    libexec
-        resolvconf
+    libexec             tags=package=clibs
+        resolvconf      tags=package=resolvconf
         ..
     ..
     media           tags=package=runtime
     ..
     mnt             tags=package=runtime
     ..
     net             tags=package=autofs
     ..
     proc            mode=0555 tags=package=runtime
     ..
     rescue          tags=package=rescue
     ..
-    root            mode=0750
+    root            mode=0750 tags=package=runtime
     ..
-    sbin
+    sbin            tags=package=runtime
     ..
     tmp             mode=01777 tags=package=runtime
     ..
-    usr
+    usr             tags=package=runtime
     ..
-    var
+    var             tags=package=runtime
     ..
 ..