diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
new file mode 100644
index 000000000000..684c9066dcc4
--- /dev/null
+++ b/etc/mtree/BSD.local.dist
@@ -0,0 +1,52 @@
+#	  fs: /usr/local
+#	  by: rgrimes
+#	date: Sun Aug 29 22:56:32 PDT 1993
+#
+
+/set type=file uname=bin gname=bin mode=0755
+bin	type=dir uname=bin gname=bin mode=0755
+..
+
+etc	type=dir uname=bin gname=bin mode=0755
+..
+
+lib	type=dir uname=bin gname=bin mode=0755
+..
+
+man	type=dir uname=bin gname=bin mode=0755
+	cat1	type=dir uname=bin gname=bin mode=0755
+	..
+	cat2	type=dir uname=bin gname=bin mode=0755
+	..
+	cat3	type=dir uname=bin gname=bin mode=0755
+	..
+	cat4	type=dir uname=bin gname=bin mode=0755
+	..
+	cat5	type=dir uname=bin gname=bin mode=0755
+	..
+	cat6	type=dir uname=bin gname=bin mode=0755
+	..
+	cat7	type=dir uname=bin gname=bin mode=0755
+	..
+	cat8	type=dir uname=bin gname=bin mode=0755
+	..
+	catl	type=dir uname=bin gname=bin mode=0755
+	..
+	man1	type=dir uname=bin gname=bin mode=0755
+	..
+	man2	type=dir uname=bin gname=bin mode=0755
+	..
+	man3	type=dir uname=bin gname=bin mode=0755
+	..
+	man4	type=dir uname=bin gname=bin mode=0755
+	..
+	man5	type=dir uname=bin gname=bin mode=0755
+	..
+	man6	type=dir uname=bin gname=bin mode=0755
+	..
+	man7	type=dir uname=bin gname=bin mode=0755
+	..
+	man8	type=dir uname=bin gname=bin mode=0755
+	..
+	manl	type=dir uname=bin gname=bin mode=0755
+..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index ad305ed975ab..6f8143344aea 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,6 +1,6 @@
 #	  fs: /usr
 #	  by: rgrimes
-#	date: Fri Jul 16 22:24:17 1993
+#	date: Sun Aug 29 22:56:32 PDT 1993
 #
 
 /set type=file uname=bin gname=bin mode=0755
@@ -8,27 +8,27 @@ bin	type=dir uname=bin gname=bin mode=0755
 ..
 
 /set type=file uname=games gname=bin mode=0700
-games	type=dir uname=bin mode=0755
+games	type=dir uname=bin gname=bin mode=0755
 	hide	type=dir uname=games gname=bin mode=0700
 	..
 ..
 
 /set type=file uname=bin gname=bin mode=0755
-include	type=dir
-	g++	type=dir
-		sys	type=dir
+include	type=dir uname=bin gname=bin mode=0755
+	g++	type=dir uname=bin gname=bin mode=0755
+		sys	type=dir uname=bin gname=bin mode=0755
 		..
 	..
-	rpc	type=dir
+	rpc	type=dir uname=bin gname=bin mode=0755
 	..
 ..
 
 /set type=file uname=bin gname=bin mode=0755
-lib	type=dir
+lib	type=dir uname=bin gname=bin mode=0755
 ..
 
 /set type=file uname=bin gname=bin mode=0755
-libexec	type=dir
+libexec	type=dir uname=bin gname=bin mode=0755
 	lpr	type=dir uname=bin gname=bin mode=0755
 	..
 	uucp	type=dir uname=bin gname=bin mode=0755
@@ -47,7 +47,7 @@ obj	type=dir uname=bin gname=bin mode=0755
 sbin	type=dir uname=bin gname=bin mode=0755
 ..
 
-share	type=dir
+share	type=dir uname=bin gname=bin mode=0755
 	calendar	type=dir uname=bin gname=bin mode=0755
 	..
 
@@ -68,14 +68,14 @@ share	type=dir
 	..
 
 	/set type=file uname=bin gname=bin mode=0755
-	man	type=dir
+	man	type=dir uname=bin gname=bin mode=0755
 		cat1	type=dir uname=bin gname=bin mode=0755
 		..
 		cat2	type=dir uname=bin gname=bin mode=0755
 		..
 		cat3	type=dir uname=bin gname=bin mode=0755
 		..
-		cat4	type=dir
+		cat4	type=dir uname=bin gname=bin mode=0755
 			i386	type=dir uname=bin gname=bin mode=0755
 			..
 		..
@@ -85,7 +85,7 @@ share	type=dir
 		..
 		cat7	type=dir uname=bin gname=bin mode=0755
 		..
-		cat8	type=dir
+		cat8	type=dir uname=bin gname=bin mode=0755
 			i386	type=dir uname=bin gname=bin mode=0755
 			..
 		..
@@ -95,7 +95,7 @@ share	type=dir
 		..
 		man3	type=dir uname=bin gname=bin mode=0755
 		..
-		man4	type=dir
+		man4	type=dir uname=bin gname=bin mode=0755
 			i386	type=dir uname=bin gname=bin mode=0755
 			..
 		..
@@ -105,7 +105,7 @@ share	type=dir
 		..
 		man7	type=dir uname=bin gname=bin mode=0755
 		..
-		man8	type=dir
+		man8	type=dir uname=bin gname=bin mode=0755
 			i386	type=dir uname=bin gname=bin mode=0755
 			..
 		..