4 files changed, 7 insertions, 17 deletions
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 2b9f19117e63..43b5ea2f43ca 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -40,7 +40,6 @@
     libexec
     ..
     man
-/set uname=man
         cat1
         ..
         cat2
@@ -63,7 +62,7 @@
         ..
         catn
         ..
-        de.ISO8859-1    uname=root
+        de.ISO8859-1
             cat1
             ..
             cat2
@@ -86,7 +85,6 @@
             ..
             catn
             ..
-/set uname=root
             man1
             ..
             man2
@@ -111,7 +109,6 @@
             ..
         ..
         en.ISO8859-1
-/set uname=man
             cat1
             ..
             cat1aout
@@ -145,7 +142,7 @@
             catn
             ..
         ..
-        ja              uname=root
+        ja
             cat1
             ..
             cat2
@@ -168,7 +165,6 @@
             ..
             catn
             ..
-/set uname=root
             man1
             ..
             man2
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index d65480e45ba5..14b5deec167f 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -645,7 +645,6 @@
             ..
         ..
         man
-/set uname=man
             cat1
             ..
             cat1aout
@@ -678,7 +677,7 @@
             ..
             catn
             ..
-            en.ISO8859-1    uname=root
+            en.ISO8859-1
                 cat1
                 ..
                 cat1aout
@@ -712,7 +711,7 @@
                 catn
                 ..
             ..
-            ja              uname=root
+            ja
                 cat1
                 ..
                 cat2
@@ -733,7 +732,6 @@
                 ..
                 catn
                 ..
-/set uname=root
                 man1
                 ..
                 man2
@@ -970,7 +968,7 @@
         ..
         perl
             man
-                cat3            uname=man
+                cat3
                 ..
                 man3
                 ..
diff --git a/etc/mtree/BSD.x11-4.dist b/etc/mtree/BSD.x11-4.dist
index dca7d089a98c..b10b0011cf8b 100644
--- a/etc/mtree/BSD.x11-4.dist
+++ b/etc/mtree/BSD.x11-4.dist
@@ -314,7 +314,6 @@
     libexec
     ..
     man
-/set uname=man
         cat1
         ..
         cat2
@@ -337,7 +336,7 @@
         ..
         catn
         ..
-        ja              uname=root
+        ja
             cat1
             ..
             cat2
@@ -360,7 +359,6 @@
             ..
             catn
             ..
-/set uname=root
             man1
             ..
             man2
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index ef3378153cba..81ddaedca8c2 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -196,7 +196,6 @@
     libexec
     ..
     man
-/set uname=man
         cat1
         ..
         cat2
@@ -219,7 +218,7 @@
         ..
         catn
         ..
-        ja              uname=root
+        ja
             cat1
             ..
             cat2
@@ -242,7 +241,6 @@
             ..
             catn
             ..
-/set uname=root
             man1
             ..
             man2