diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index d602d3ae4a84..c166b8f91b87 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,7 +1,7 @@
-# $Id: BSD.include.dist,v 1.16 1998/03/04 10:22:51 dufault Exp $
+# $Id: BSD.include.dist,v 1.17 1998/05/28 06:59:50 peter Exp $
#
-/set type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
.
arpa
..
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 32da1a4e59da..8146eb2dd633 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,11 +1,11 @@
-# $Id: BSD.root.dist,v 1.27 1997/10/01 13:06:30 ache Exp $
+# $Id: BSD.root.dist,v 1.28 1997/10/20 00:35:38 jmb Exp $
#
/set type=dir uname=root gname=wheel mode=0755
.
- bin uname=bin gname=bin
+ bin uname=root gname=wheel
..
-/set type=dir uname=bin gname=bin mode=0555
+/set type=dir uname=root gname=wheel mode=0555
dev uname=root gname=wheel mode=0755
fd
..
@@ -37,7 +37,7 @@
uucp uname=uucp gname=uucp mode=0770
..
..
- lkm uname=bin gname=bin
+ lkm uname=root gname=wheel
..
mnt
..
@@ -45,9 +45,9 @@
..
root
..
- sbin uname=bin gname=bin
+ sbin uname=root gname=wheel
..
- tmp uname=bin gname=bin mode=01777
+ tmp uname=root gname=wheel mode=01777
..
usr
..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 3dd44a2761f6..dd2e316fbd0f 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,16 +1,16 @@
-# $Id: BSD.usr.dist,v 1.122 1998/09/10 15:46:41 bde Exp $
+# $Id: BSD.usr.dist,v 1.123 1998/09/12 21:16:16 jkh Exp $
#
-/set type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
. uname=root gname=wheel
bin
..
-/set type=dir uname=games gname=bin mode=0700
- games uname=bin mode=0755
+/set type=dir uname=games gname=games mode=0700
+ games uname=root mode=0755
hide gname=games uname=root mode=0550
..
..
-/set type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
include
..
lib
@@ -350,8 +350,8 @@
worm
..
..
-/set type=dir uname=games gname=bin mode=0755
- games uname=bin
+/set type=dir uname=games gname=games mode=0755
+ games uname=root
atc
..
fortune
@@ -361,7 +361,7 @@
quiz.db
..
..
-/set type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
groff_font
devX100
..
@@ -464,8 +464,8 @@
zh_TW.BIG5
..
..
-/set type=dir uname=man gname=bin mode=0755
- man uname=bin
+/set type=dir uname=man gname=root mode=0755
+ man uname=wheel
cat1
..
cat1aout
@@ -494,7 +494,7 @@
..
catn
..
- ja uname=bin
+ ja uname=root
cat1
..
cat2
@@ -515,36 +515,36 @@
..
catn
..
- man1 uname=bin
+ man1 uname=root
..
- man2 uname=bin
+ man2 uname=root
..
- man3 uname=bin
+ man3 uname=root
..
- man4 uname=bin
+ man4 uname=root
..
- man5 uname=bin
+ man5 uname=root
..
- man6 uname=bin
+ man6 uname=root
..
- man7 uname=bin
+ man7 uname=root
..
- man8 uname=bin
+ man8 uname=root
..
- man9 uname=bin
+ man9 uname=root
..
- mann uname=bin
+ mann uname=root
..
..
- man1 uname=bin
+ man1 uname=root
..
- man1aout uname=bin
+ man1aout uname=root
..
- man2 uname=bin
+ man2 uname=root
..
- man3 uname=bin
+ man3 uname=root
..
-/set type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
man4
i386
..
@@ -659,15 +659,15 @@
..
..
perl
-/set type=dir uname=man gname=bin mode=0755
- man uname=bin
+/set type=dir uname=root gname=wheel mode=0755
+ man uname=root
cat3
..
- man3 uname=bin
+ man3 uname=root
..
..
..
-/set type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
skel
..
syscons
@@ -694,7 +694,7 @@
tcl
..
..
-/set type=dir uname=bin gname=bin mode=0555
+/set type=dir uname=root gname=wheel mode=0555
zoneinfo mode=0755
Africa
..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 53bfd73787f2..62889744c75f 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,7 +1,7 @@
-# $Id: BSD.var.dist,v 1.34 1997/09/24 17:40:11 ache Exp $
+# $Id: BSD.var.dist,v 1.35 1997/10/01 13:06:31 ache Exp $
#
-/set type=dir uname=bin gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
. uname=root gname=wheel
account
..
@@ -21,9 +21,9 @@
tabs
..
..
- db uname=bin gname=bin mode=0755
+ db uname=root gname=wheel mode=0755
..
-/set type=dir uname=root gname=bin mode=0755
+/set type=dir uname=root gname=wheel mode=0755
games gname=games mode=0775
hackdir gname=games mode=0770
save gname=games mode=0770
@@ -34,29 +34,29 @@
phantasia gname=games mode=0775
..
..
- log uname=bin
+ log uname=root
..
- mail uname=bin gname=mail mode=0775
+ mail uname=root gname=mail mode=0775
..
msgs uname=daemon
..
- preserve uname=bin
+ preserve uname=root
..
run uname=root
..
- rwho uname=bin gname=daemon mode=0775
+ rwho uname=root gname=daemon mode=0775
..
/set type=dir uname=uucp gname=daemon mode=0755
- spool uname=bin gname=bin
+ spool uname=root gname=wheel
lock gname=dialer mode=0775
..
- lpd uname=bin
+ lpd uname=root
..
mqueue uname=root
..
opielocks uname=root mode=0700
..
- output uname=bin
+ output uname=root
lpd uname=root gname=daemon
..
..
@@ -76,7 +76,7 @@
uucppublic mode=0777
..
..
-/set type=dir uname=bin gname=bin mode=01777
+/set type=dir uname=root gname=wheel mode=01777
tmp
vi.recover
..
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 345fbe3210a6..fece2848e2e5 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $Id: bsd.own.mk,v 1.17 1998/08/30 20:35:24 jb Exp $
+# $Id: bsd.own.mk,v 1.18 1998/08/31 23:34:37 jb Exp $
#
# The include file <bsd.own.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
@@ -31,9 +31,9 @@
# OBJFORMAT Default object format that selects which set of tools to run.
# [elf on alpha, aout otherwise]
#
-# BINOWN Binary owner. [bin]
+# BINOWN Binary owner. [root]
#
-# BINGRP Binary group. [bin]
+# BINGRP Binary group. [wheel]
#
# BINMODE Binary mode. [555]
#
@@ -70,9 +70,9 @@
# SHAREDIR Base path for architecture-independent ascii
# text files. [/usr/share]
#
-# SHAREOWN ASCII text file owner. [bin]
+# SHAREOWN ASCII text file owner. [root]
#
-# SHAREGRP ASCII text file group. [bin]
+# SHAREGRP ASCII text file group. [wheel]
#
# SHAREMODE ASCII text file mode. [${NOBINMODE}]
#
@@ -138,8 +138,8 @@ OBJFORMAT?= aout
.endif
# Binaries
-BINOWN?= bin
-BINGRP?= bin
+BINOWN?= root
+BINGRP?= wheel
BINMODE?= 555
NOBINMODE?= 444
@@ -164,8 +164,8 @@ KMODMODE?= ${BINMODE}
# Share files
SHAREDIR?= /usr/share
-SHAREOWN?= bin
-SHAREGRP?= bin
+SHAREOWN?= root
+SHAREGRP?= wheel
SHAREMODE?= ${NOBINMODE}
MANDIR?= ${SHAREDIR}/man/man