diff --git a/etc/Makefile b/etc/Makefile
index 641cf2dcfe6e..849f06be94e9 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -379,10 +379,10 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 		d=${DISTBASE}$$d; \
 		shift; \
 		test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \
-		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
+		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \
 		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
 		${MTREE_FILTER} $$m | \
-		${MTREE_CMD:N-W} -C -K uname,gname | sed s#^\.#.$$d# | \
+		${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \
 		    ${METALOG.add} ; \
 	done; true
 .endif
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 92555fbc4cab..267913d89131 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -18,7 +18,7 @@
         ..
         modules
         ..
-        overlays
+        overlays              tags=package=runtime
         ..
         zfs
         ..