From 28caef55d93aa08bb7f1d3d88d60ecf8f750b818 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Wed, 18 Sep 1996 22:03:49 +0000
Subject: [PATCH] do not use chgrp

---
 src/etc/etc.alpha/MAKEDEV   | 14 +++++++-------
 src/etc/etc.amiga/MAKEDEV   | 22 ++++++++++-----------
 src/etc/etc.arc/MAKEDEV     | 14 +++++++-------
 src/etc/etc.arm32/MAKEDEV   | 20 +++++++++----------
 src/etc/etc.atari/MAKEDEV   | 24 +++++++++++------------
 src/etc/etc.hp300/MAKEDEV   | 10 +++++-----
 src/etc/etc.i386/MAKEDEV    | 22 ++++++++++-----------
 src/etc/etc.mac68k/MAKEDEV  | 18 +++++++++---------
 src/etc/etc.mvme68k/MAKEDEV | 26 ++++++++++++-------------
 src/etc/etc.pc532/MAKEDEV   | 16 ++++++++--------
 src/etc/etc.pmax/MAKEDEV    | 10 +++++-----
 src/etc/etc.sparc/MAKEDEV   | 16 ++++++++--------
 src/etc/etc.sun3/MAKEDEV    |  8 ++++----
 src/etc/etc.vax/MAKEDEV     | 10 +++++-----
 src/etc/etc.x68k/MAKEDEV    | 38 ++++++++++++++++++-------------------
 15 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 4c5e56f3..927b81d8 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.9 1996/08/29 13:22:21 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.10 1996/09/18 22:03:37 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -91,9 +91,9 @@ all)
 std)
 	rm -f console drum mem kmem null zero io tty klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chgrp kmem mem
+	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
 	mknod null		c 2 2	; chmod 666 null
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod tty		c 1 0	; chmod 666 tty
@@ -139,7 +139,7 @@ cd*|sd*|vnd*|ccd*)
 	mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 	mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 	mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 	umask 77
 	;;
@@ -210,7 +210,7 @@ st*)
 	mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 	mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 	mknod enr${name}${unit} c $chr `expr $unit '*' 16 + 3`
-	chgrp operator ${name}${unit} n${name}${unit} \
+	chown root.operator ${name}${unit} n${name}${unit} \
 		e$name$unit en$name$unit \
 		r${name}${unit} nr${name}${unit} \
 		er${name}${unit} enr${name}${unit}
@@ -228,7 +228,7 @@ ch*)
 	esac
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	chgrp operator ${name}${unit}
+	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
 	;;
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index e4f9d1c3..299bd238 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.13 1996/08/29 13:22:22 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.14 1996/09/18 22:03:38 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -121,9 +121,9 @@ std)
 	rm -f console drum kmem mem reload null zero tty
 	rm -f klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chgrp kmem mem
+	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
 	mknod reload		c 2 20	; chmod 600 reload
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod null		c 2 2	; chmod 666 null
@@ -164,7 +164,7 @@ st*)
 		mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 		mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 		mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-		chgrp operator ${name}${unit} n${name}${unit} \
+		chown root.operator ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -189,7 +189,7 @@ fd*)
 		mknod fd${unit}b b 2 `expr $unit '*' 16 + 1`
 		mknod rfd${unit}a c 18 `expr $unit '*' 16`
 		mknod rfd${unit}b c 18 `expr $unit '*' 16 + 1`
-		chgrp operator fd$unit? rfd$unit?
+		chown root.operator fd$unit? rfd$unit?
 		chmod 640 fd$unit? rfd$unit?
 		;;
 	*)
@@ -245,7 +245,7 @@ sd*|vnd*|ccd*|wd*)
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
 		fi
-		chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 		;;
 	*)
@@ -268,7 +268,7 @@ cd*|acd*)
 		mknod ${name}${unit}c   b $blk `expr $unit '*' 8 + 2`
 		mknod r${name}${unit}a  c $chr `expr $unit '*' 8 + 0`
 		mknod r${name}${unit}c  c $chr `expr $unit '*' 8 + 2`
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
@@ -288,7 +288,7 @@ tty0*|ttyA*)
 			rm -f tty0${unit} ttym${unit}
 			mknod tty0${unit} c 12 0
 			mknod ttym${unit} c 12 128
-			chown uucp:wheel tty0${unit} ttym${unit}
+			chown uucp.wheel tty0${unit} ttym${unit}
 			;;
 		*)
 			echo bad unit for tty0 in: $i
@@ -300,7 +300,7 @@ tty0*|ttyA*)
 			rm -f ttyA${unit} ttyM${unit}
 			mknod ttyA${unit} c 17 $unit
 			mknod ttyM${unit} c 17 `expr 128 + $unit`
-			chown uucp:wheel ttyA${unit} ttyM${unit}
+			chown uucp.wheel ttyA${unit} ttyM${unit}
 			;;
 		*)
 			echo bad unit for ttyA in: $i
@@ -468,7 +468,7 @@ tun*)
 lkm)
         rm -f lkm
         mknod lkm c 24 0
-        chown root:kmem lkm
+        chown root.kmem lkm
         chmod 640 lkm
         ;;
 
diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
index 6b71b02c..a4208a4c 100644
--- a/src/etc/etc.arc/MAKEDEV
+++ b/src/etc/etc.arc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.7 1996/09/18 08:46:57 pefo Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 1996/09/18 22:03:39 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -58,9 +58,9 @@ all)
 
 std)
 	mknod console		c 0 0
-	mknod drum		c 1 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
+	mknod drum		c 1 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 3 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 3 0	; chmod 640 mem ; chown root.kmem mem
 	mknod null		c 3 2	; chmod 666 null
 	mknod zero              c 3 12  ; chmod 666 zero
 	mknod tty		c 2 0	; chmod 666 tty
@@ -121,7 +121,7 @@ st*)
 		mknod nr${name}${unit} c $chr $unit1
 		mknod r${name}h${unit} c $chr $unit2
 		mknod nr${name}h${unit} c $chr $unit3
-		chgrp operator r${name}${unit} nr${name}${unit} \
+		chown root.operator r${name}${unit} nr${name}${unit} \
 			r${name}h${unit} nr${name}h${unit}
 		chmod 640 r${name}${unit} nr${name}${unit} \
 			r${name}h${unit} nr${name}h${unit}
@@ -197,7 +197,7 @@ fd*|sd*|vnd*)
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
 	    fi
-	    chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+	    chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 	    chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 	    ;;
 	*)
@@ -217,7 +217,7 @@ cd*)
 	mknod ${name}${unit}c   b $blk `expr $unit '*' 8 + 2`
 	mknod r${name}${unit}a  c $chr `expr $unit '*' 8 + 0`
 	mknod r${name}${unit}c  c $chr `expr $unit '*' 8 + 2`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h] 
 	umask 77
 	;;
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
index efa06fc3..ff10d08f 100644
--- a/src/etc/etc.arm32/MAKEDEV
+++ b/src/etc/etc.arm32/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.5 1996/08/28 08:55:22 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.6 1996/09/18 22:03:40 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -105,11 +105,11 @@ floppy)
 std)
 	rm -f console drum mem kmem null zero tty klog stdin stdout stderr kbd
 	rm -f kbdctl vidcvideo0 vidc iic rtc0
-	mknod mem		c 0 0	; chmod 640 mem	; chgrp kmem mem
-	mknod kmem		c 0 1	; chmod 640 kmem ; chgrp kmem kmem
+	mknod mem		c 0 0	; chmod 640 mem	; chown root.kmem mem
+	mknod kmem		c 0 1	; chmod 640 kmem ; chown root.kmem kmem
 	mknod null		c 0 2	; chmod 666 null
 	mknod zero		c 0 3	; chmod 666 zero
-	mknod drum		c 1 0	; chmod 640 drum ; chgrp kmem drum
+	mknod drum		c 1 0	; chmod 640 drum ; chown root.kmem drum
 	mknod console		c 2 0
 	mknod tty		c 3 0	; chmod 666 tty
 	mknod klog		c 5 0	; chmod 600 klog
@@ -168,7 +168,7 @@ fd*|sd*|vnd*|wd*|ccd*)
 	mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 	mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 	mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 	umask 77
 	;;
@@ -219,7 +219,7 @@ st*)
 	mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 	mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 	mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-	chgrp operator ${name}${unit} n${name}${unit} \
+	chown root.operator ${name}${unit} n${name}${unit} \
 		e$name$unit en$name$unit \
 		r${name}${unit} nr${name}${unit} \
 		er${name}${unit} enr${name}${unit} 
@@ -237,7 +237,7 @@ ch*)
 	esac
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	chgrp operator ${name}${unit}
+	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
 	;;
@@ -249,7 +249,7 @@ uk*)
 	esac
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr $unit
-	chgrp operator ${name}${unit}
+	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
 	;;
@@ -261,7 +261,7 @@ ss*)
 	esac
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	chgrp operator ${name}${unit}
+	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
 	;;
@@ -276,7 +276,7 @@ cd*)
 	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
 	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
 	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 	umask 77
 	;;
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
index bd15bab7..6d20ed9b 100644
--- a/src/etc/etc.atari/MAKEDEV
+++ b/src/etc/etc.atari/MAKEDEV
@@ -105,11 +105,11 @@ std)
 	rm -f console drum kmem mem nvram reload null zero tty
 	rm -f klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chgrp kmem mem
-	mknod nvram		c 2 11	; chmod 640 nvram ; chgrp kmem nvram
-	mknod reload		c 2 20	; chmod 640 reload ; chgrp kmem reload
+	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
+	mknod nvram		c 2 11	; chmod 640 nvram ; chown root.kmem nvram
+	mknod reload		c 2 20	; chmod 640 reload ; chown root.kmem reload
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod null		c 2 2	; chmod 666 null
 	mknod tty		c 1 0	; chmod 666 tty
@@ -134,13 +134,13 @@ fd)
 ser02)
 	rm -f ser02
 	mknod ser02 c 7 0
-	chown uucp:wheel ser02
+	chown uucp.wheel ser02
 	;;
 
 mdm02)
 	rm -f mdm02
 	mknod mdm02 c 7 16
-	chown uucp:wheel mdm02
+	chown uucp.wheel mdm02
 	;;
 
 st*)
@@ -160,7 +160,7 @@ st*)
 		mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 		mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 		mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-		chgrp operator ${name}${unit} n${name}${unit} \
+		chown root.operator ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -187,7 +187,7 @@ fd*)
 		mknod rfd${unit}a c 16 `expr $unit '*' 16`
 		mknod rfd${unit}b c 16 `expr $unit '*' 16 + 1`
 		mknod rfd${unit}c c 16 `expr $unit '*' 16 + 2`
-		chgrp operator fd$unit? rfd$unit?
+		chown root.operator fd$unit? rfd$unit?
 		chmod 640 fd$unit? rfd$unit?
 		;;
 	*)
@@ -248,7 +248,7 @@ sd*|vnd*|ccd*)
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
 		fi
-		chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 		;;
 	*)
@@ -269,7 +269,7 @@ cd*)
 		mknod ${name}${unit}a   b $blk `expr $unit '*' 8 + 0`
 		mknod ${name}${unit}d   b $blk `expr $unit '*' 8 + 3`
 		mknod r${name}${unit}a  c $chr `expr $unit '*' 8 + 0`
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
@@ -393,7 +393,7 @@ tun*)
 lkm)
         rm -f lkm
         mknod lkm c 20 0
-        chown root:kmem lkm
+        chown root.kmem lkm
         chmod 640 lkm
         ;;
 
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index debed611..743012a7 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.7 1996/07/23 06:32:55 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 1996/09/18 22:03:42 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -82,9 +82,9 @@ all)
 std)
 	rm -f console drum kmem mem null zero tty klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chgrp kmem mem
+	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
 	mknod null		c 2 2	; chmod 666 null
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod tty		c 1 0	; chmod 666 tty
@@ -192,7 +192,7 @@ ccd*|fd*|rd*|sd*|vnd*)
 		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 66c0aba6..085d9e74 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.23 1996/09/16 03:43:34 tholo Exp $
+#	$OpenBSD: MAKEDEV,v 1.24 1996/09/18 22:03:42 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -108,12 +108,12 @@ floppy)
 std)
 	rm -f console drum mem kmem null zero io tty klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 4 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem	; chgrp kmem mem
+	mknod drum		c 4 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem	; chown root.kmem mem
 	mknod null		c 2 2	; chmod 666 null
 	mknod zero		c 2 12	; chmod 666 zero
-	mknod io		c 2 14	; chmod 640 io ; chgrp kmem io
+	mknod io		c 2 14	; chmod 640 io ; chown root.kmem io
 	mknod tty		c 1 0	; chmod 666 tty
 	mknod klog		c 7 0	; chmod 600 klog
 	mknod stdin		c 22 0	; chmod 666 stdin
@@ -155,7 +155,7 @@ wt*)
 	mknod n$name$unit	b $blk `expr $unit '*' 8 + 4`
 	mknod r$name$unit	c $chr `expr $unit '*' 8 + 0`
 	mknod nr$name$unit	c $chr `expr $unit '*' 8 + 4`
-	chgrp operator $name$unit n$name$unit r$name$unit nr$name$unit
+	chown root.operator $name$unit n$name$unit r$name$unit nr$name$unit
 	chmod 640 $name$unit n$name$unit r$name$unit nr$name$unit
 	umask 77
 	;;
@@ -164,7 +164,7 @@ rd*)
 	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
 	mknod rd${unit} b 17 $unit
 #	mknod rrd${unit} c 9 $unit
-	chgrp operator rd${unit} rrd${unit}
+	chown root.operator rd${unit} rrd${unit}
 	chmod 640 rd${unit} rrd${unit}
 	umask 77
 	;;
@@ -211,7 +211,7 @@ ccd*|fd*|sd*|vnd*|wd*)
 	mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
 	mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 	mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-	chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+	chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 	chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 	umask 77
 	;;
@@ -263,7 +263,7 @@ st*)
 	mknod nr$name$unit	c $chr `expr $unit '*' 16 + 1`
 	mknod er$name$unit	c $chr `expr $unit '*' 16 + 2`
 	mknod enr$name$unit	c $chr `expr $unit '*' 16 + 3`
-	chgrp operator $name$unit n$name$unit e$name$unit en$name$unit \
+	chown root.operator $name$unit n$name$unit e$name$unit en$name$unit \
 		r$name$unit nr$name$unit er$name$unit enr$name$unit 
 	chmod 640 $name$unit n$name$unit e$name$unit en$name$unit \
 		r$name$unit nr$name$unit er$name$unit enr$name$unit 
@@ -277,7 +277,7 @@ ch*)
 	esac
 	rm -f $name$unit
 	mknod $name$unit	c $chr `expr $unit '*' 16 + 0`
-	chgrp operator $name$unit
+	chown root.operator $name$unit
 	chmod 640 $name$unit
 	umask 77
 	;;
@@ -294,7 +294,7 @@ cd*|mcd*|acd*)
 	mknod ${name}${unit}d	b $blk `expr $unit '*' 16 + 3`
 	mknod r${name}${unit}a	c $chr `expr $unit '*' 16 + 0`
 	mknod r${name}${unit}d	c $chr `expr $unit '*' 16 + 3`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 	umask 77
 	;;
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index ec09b3ac..66577924 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.7 1996/08/28 08:55:24 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 1996/09/18 22:03:43 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -93,10 +93,10 @@ std)
 	rm -f console drum kmem mem reload zero null tty
 	rm -f klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chgrp kmem mem
-	mknod reload		c 2 20	; chmod 640 reload ; chgrp kmem reload
+	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
+	mknod reload		c 2 20	; chmod 640 reload ; chown root.kmem reload
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod null		c 2 2	; chmod 666 null
 	mknod tty		c 1 0	; chmod 666 tty
@@ -143,7 +143,7 @@ sd*|vnd*|ccd*)
 		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
@@ -222,7 +222,7 @@ st*)
 		mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 		mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 		mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-		chgrp operator ${name}${unit} n${name}${unit} \
+		chown root.operator ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -247,7 +247,7 @@ ch*)
 	case $unit in
 	0|1|2|3|4|5|6)
 		mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-		chgrp operator ${name}${unit}
+		chown root.operator ${name}${unit}
 		chmod 640 ${name}${unit}
 		;;
 	*)
@@ -269,7 +269,7 @@ cd*)
 		mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
 		mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
 		mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index b05459b3..acdf17af 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.10 1996/08/28 08:55:25 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.11 1996/09/18 22:03:44 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: MAKEDEV,v 1.10 1996/08/28 08:55:25 deraadt Exp $
+#	$Id: MAKEDEV,v 1.11 1996/09/18 22:03:44 deraadt Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
@@ -99,9 +99,9 @@ std)
 	rm -f console drum kmem mem null zero tty
 	rm -f klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chgrp kmem mem
+	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod null		c 2 2	; chmod 666 null
 	mknod tty		c 1 0	; chmod 666 tty
@@ -139,7 +139,7 @@ st*)
 		mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 		mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 		mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-		chgrp operator ${name}${unit} n${name}${unit} \
+		chown root.operator ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -200,7 +200,7 @@ sd*|vnd*|ccd*)
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
 		fi
-		chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 		;;
 	*)
@@ -222,7 +222,7 @@ cd*)
 		mknod ${name}${unit}c   b $blk `expr $unit '*' 8 + 2`
 		mknod r${name}${unit}a  c $chr `expr $unit '*' 8 + 0`
 		mknod r${name}${unit}c  c $chr `expr $unit '*' 8 + 2`
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
@@ -242,7 +242,7 @@ tty0*|ttya|ttyb|ttyc|ttyd)
 			rm -f tty0${unit} cua0${unit}
 			mknod tty0${unit} c 13 ${unit}
 			mknod cua0${unit} c 13 `expr 128 + ${unit}`
-			chown uucp:wheel tty0${unit} cua0${unit}
+			chown uucp.wheel tty0${unit} cua0${unit}
 			;;
 		*)
 			echo bad unit for tty0 in: $i
@@ -255,7 +255,7 @@ tty0*|ttya|ttyb|ttyc|ttyd)
 		rm -f tty${unit} cua${unit}
 		mknod tty${unit} c 12 ${num}
 		mknod cua${unit} c 12 `expr 128 + ${num}`
-		chown uucp:wheel tty${unit} cua${unit}
+		chown uucp.wheel tty${unit} cua${unit}
 		;;
 	*)
 		echo bad type for tty in: $i
@@ -325,14 +325,14 @@ rd*)
 	mknod  rd$unit b 9 $unit
 #	mknod rrd$unit b ??? `expr $unit + 16`
 	mknod rd${unit}c b 9 `expr $unit + 16`
-	chgrp operator rd$unit rd${unit}c 
+	chown root.operator rd$unit rd${unit}c 
 	chmod 640 rd$unit rd${unit}c 
 	;;
 
 lkm)
         rm -f lkm
         mknod lkm c 24 0
-        chown root:kmem lkm
+        chown root.kmem lkm
         chmod 640 lkm
         ;;
 
@@ -346,7 +346,7 @@ sram*|nvram*|flash*|vmel*|vmes*)
 	vmes*) maj=32;;
 	esac
         mknod $i c ${maj} 0
-        chown root:kmem $i
+        chown root.kmem $i
         chmod 640 $i
 	;;
 
diff --git a/src/etc/etc.pc532/MAKEDEV b/src/etc/etc.pc532/MAKEDEV
index 67f88d2e..1d37e1e9 100644
--- a/src/etc/etc.pc532/MAKEDEV
+++ b/src/etc/etc.pc532/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.6 1996/08/28 08:55:26 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 1996/09/18 22:03:45 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -78,9 +78,9 @@ floppy)
 std)
 	rm -f console drum mem kmem null zero io tty klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 4 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem	; chgrp kmem mem
+	mknod drum		c 4 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem	; chown root.kmem mem
 	mknod null		c 2 2	; chmod 666 null
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod tty		c 1 0	; chmod 666 tty
@@ -105,7 +105,7 @@ rd*)
 	umask 2 ; unit=`expr $i : '.*d\(.*\)'`
 	mknod rd${unit} b 3 $unit
 	mknod rrd${unit} c 9 $unit
-	chgrp operator rd${unit} rrd${unit}
+	chown root.operator rd${unit} rrd${unit}
 	chmod 640 rd${unit} rrd${unit}
 	umask 77
 	;;
@@ -134,7 +134,7 @@ sd*|vnd*|ccd*)
 	mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 	mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 	mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 	umask 77
 	;;
@@ -184,7 +184,7 @@ st*)
 	mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 	mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 	mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-	chgrp operator ${name}${unit} n${name}${unit} \
+	chown root.operator ${name}${unit} n${name}${unit} \
 		e$name$unit en$name$unit \
 		r${name}${unit} nr${name}${unit} \
 		er${name}${unit} enr${name}${unit} 
@@ -205,7 +205,7 @@ cd*)
 	mknod ${name}${unit}d	b $blk `expr $unit '*' 8 + 3`
 	mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
 	mknod r${name}${unit}d	c $chr `expr $unit '*' 8 + 3`
-	chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+	chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 	chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 	umask 77
 	;;
diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV
index 6076f734..93636599 100644
--- a/src/etc/etc.pmax/MAKEDEV
+++ b/src/etc/etc.pmax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.6 1996/08/28 08:55:27 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.7 1996/09/18 22:03:46 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -40,9 +40,9 @@ case $i in
 
 std)
 	mknod console		c 0 0
-	mknod drum		c 1 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
+	mknod drum		c 1 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 3 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 3 0	; chmod 640 mem ; chown root.kmem mem
 	mknod null		c 3 2	; chmod 666 null
 	mknod zero              c 3 12  ; chmod 666 zero
 	mknod tty		c 2 0	; chmod 666 tty
@@ -138,7 +138,7 @@ rz*|vnd*|vn*|ccd*)
 		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
 		fi
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 7cbbc49b..6f35f1da 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.8 1996/09/12 05:07:52 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.9 1996/09/18 22:03:47 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -90,13 +90,13 @@ all)
 std)
 	mknod console		c 0 0
 	mknod tty		c 2 0	; chmod 666 tty
-	mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
+	mknod kmem		c 3 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 3 0	; chmod 640 mem ; chown root.kmem mem
 	mknod null		c 3 2	; chmod 666 null
 	mknod zero		c 3 12	; chmod 666 zero
-	mknod eeprom		c 3 11  ; chmod 640 eeprom ; chgrp kmem eeprom
+	mknod eeprom		c 3 11  ; chmod 640 eeprom ; chown root.kmem eeprom
 	mknod openprom		c 70 0  ; chmod 644 openprom
-	mknod drum		c 7 0	; chmod 640 drum ; chgrp kmem drum
+	mknod drum		c 7 0	; chmod 640 drum ; chown root.kmem drum
 	mknod klog		c 16 0	; chmod 600 klog
 	mknod stdin		c 24 0	; chmod 666 stdin
 	mknod stdout		c 24 1	; chmod 666 stdout
@@ -210,7 +210,7 @@ ccd*|fd*|sd*|xd*|xy*|cd*|vnd*)
 		mknod r${name}${unit}n	c $chr `expr $unit '*' 16 + 13`
 		mknod r${name}${unit}o	c $chr `expr $unit '*' 16 + 14`
 		mknod r${name}${unit}p	c $chr `expr $unit '*' 16 + 15`
-		chgrp operator ${name}${unit}[a-p] r${name}${unit}[a-p]
+		chown root.operator ${name}${unit}[a-p] r${name}${unit}[a-p]
 		chmod 640 ${name}${unit}[a-p] r${name}${unit}[a-p]
 		;;
 	*)
@@ -235,7 +235,7 @@ st*)
 	mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 	mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 	mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-	chgrp operator ${name}${unit} n${name}${unit} \
+	chown root.operator ${name}${unit} n${name}${unit} \
 		e$name$unit en$name$unit \
 		r${name}${unit} nr${name}${unit} \
 		er${name}${unit} enr${name}${unit} 
@@ -253,7 +253,7 @@ ch*)
 	esac
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	chgrp operator ${name}${unit}
+	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
 	;;
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index ee4c0fa4..653bd10c 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.8 1996/08/28 08:55:29 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.9 1996/09/18 22:03:47 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.8 1996/03/03 16:54:17 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -105,9 +105,9 @@ std)
 	mk klog		c 16 0 600
 	mk fb		c 22 0
 	mk kbd		c 29 0
-      mk stdin        c 23 0
-      mk stdout       c 23 1
-      mk stderr       c 23 2
+	mk stdin        c 23 0
+	mk stdout       c 23 1
+	mk stderr       c 23 2
 	;;
 
 fd)
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 5f49899b..55613e56 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.7 1996/08/28 08:55:30 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 1996/09/18 22:03:48 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/01/07 16:53:15 ragge Exp $
 #
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
@@ -67,7 +67,7 @@ all)
 
 std)
 	mknod console		c 0 0
-	mknod drum		c 7 0	; chmod 640 drum ; chgrp kmem drum
+	mknod drum		c 7 0	; chmod 640 drum ; chown root.kmem drum
 	mknod floppy		c 8 0
 	mknod crl		c 35 0
 	mknod csa1		c 51 0
@@ -75,8 +75,8 @@ std)
 	mknod tu0		b 8 0
 	mknod tu1		b 8 1
 	mknod kUmem		c 3 3	; chmod 600 kUmem
-	mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
+	mknod kmem		c 3 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 3 0	; chmod 640 mem ; chown root.kmem mem
 	mknod null		c 3 2	; chmod 666 null
 	mknod zero              c 3 12  ; chmod 666 zero
 	mknod tty		c 2 0	; chmod 666 tty
@@ -212,7 +212,7 @@ hp*|hk*|up*|ra*|kra*|rl*|rb*|ccd*|vnd*)
 		mknod r${name}${unit}f	c $chr `expr $unit '*' 8 + 5`
 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
 		fi
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
diff --git a/src/etc/etc.x68k/MAKEDEV b/src/etc/etc.x68k/MAKEDEV
index 07a8fc9c..b5b42045 100644
--- a/src/etc/etc.x68k/MAKEDEV
+++ b/src/etc/etc.x68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.4 1996/07/23 06:33:01 etheisen Exp $
+#	$OpenBSD: MAKEDEV,v 1.5 1996/09/18 22:03:49 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.1.1.1.4.1 1996/06/17 02:36:16 oki Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -34,7 +34,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: MAKEDEV,v 1.4 1996/07/23 06:33:01 etheisen Exp $
+#	$Id: MAKEDEV,v 1.5 1996/09/18 22:03:49 deraadt Exp $
 #
 #	from:
 #	hp300/MAKEDEV (1/15/94), from:
@@ -113,10 +113,10 @@ std)
 	rm -f console drum kmem mem reload null zero tty
 	rm -f klog stdin stdout stderr
 	mknod console		c 0 0
-	mknod drum		c 3 0	; chmod 640 drum ; chgrp kmem drum
-	mknod kmem		c 2 1	; chmod 640 kmem ; chgrp kmem kmem
-	mknod mem		c 2 0	; chmod 640 mem ; chgrp kmem mem
-	mknod reload		c 2 20	; chmod 640 mem ; chgrp kmem mem
+	mknod drum		c 3 0	; chmod 640 drum ; chown root.kmem drum
+	mknod kmem		c 2 1	; chmod 640 kmem ; chown root.kmem kmem
+	mknod mem		c 2 0	; chmod 640 mem ; chown root.kmem mem
+	mknod reload		c 2 20	; chmod 640 mem ; chown root.kmem mem
 	mknod zero		c 2 12	; chmod 666 zero
 	mknod null		c 2 2	; chmod 666 null
 	mknod tty		c 1 0	; chmod 666 tty
@@ -155,7 +155,7 @@ st*)
 		mknod nr${name}${unit}	c $chr `expr $unit '*' 16 + 1`
 		mknod er${name}${unit}	c $chr `expr $unit '*' 16 + 2`
 		mknod enr${name}${unit}	c $chr `expr $unit '*' 16 + 3`
-		chgrp operator ${name}${unit} n${name}${unit} \
+		chown root.operator ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -192,7 +192,7 @@ fd*)
 		mknod rfd${unit}f c 18 `expr $unit '*' 8 + 5`
 		mknod rfd${unit}g c 18 `expr $unit '*' 8 + 6`
 		mknod rfd${unit}h c 18 `expr $unit '*' 8 + 7`
-		chgrp operator fd$unit? rfd$unit?
+		chown root.operator fd$unit? rfd$unit?
 		chmod 640 fd$unit? rfd$unit?
 		;;
 	*)
@@ -231,7 +231,7 @@ sd*|vnd*|ccd*)
 		mknod r${name}${unit}g	c $chr `expr $unit '*' 8 + 6`
 		mknod r${name}${unit}h	c $chr `expr $unit '*' 8 + 7`
 		fi
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
@@ -252,7 +252,7 @@ cd*)
 		mknod ${name}${unit}a   b $blk `expr $unit '*' 8 + 0`
 		mknod ${name}${unit}d   b $blk `expr $unit '*' 8 + 3`
 		mknod r${name}${unit}a  c $chr `expr $unit '*' 8 + 0`
-		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
+		chown root.operator ${name}${unit}[a-h] r${name}${unit}[a-h]
 		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		;;
 	*)
@@ -269,7 +269,7 @@ ss*)
 	esac
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	chgrp operator ${name}${unit}
+	chown root.operator ${name}${unit}
 	chmod 640 ${name}${unit}
 	umask 77
 	;;
@@ -282,7 +282,7 @@ tty0*)
 		rm -f tty0${unit} ttym${unit}
 		mknod tty0${unit} c 12 $unit
 		mknod ttym${unit} c 12 `expr 128 + $unit`
-		chown uucp:wheel tty0${unit} ttym${unit}
+		chown uucp.wheel tty0${unit} ttym${unit}
 		;;
 	*)
 		echo bad unit for ser in: $i
@@ -298,7 +298,7 @@ com*)
 	0|1)
 		rm -f com${unit}
 		mknod com${unit} c 16 $unit
-		chown uucp:wheel com${unit}
+		chown uucp.wheel com${unit}
 		;;
 	*)
 		echo bad unit for com in: $i
@@ -425,7 +425,7 @@ bpf*)
 	unit=`expr $i : 'bpf\(.*\)'`
 	rm -f bpf$unit
 	mknod bpf$unit c 22 $unit
-	chown root:wheel bpf$unit
+	chown root.wheel bpf$unit
 	;;
 
 tun*)
@@ -433,13 +433,13 @@ tun*)
 	rm -f tun$unit
 	mknod tun$unit c 31 $unit
 	chmod 600 tun$unit
-	chown root:wheel tun$unit
+	chown root.wheel tun$unit
 	;;
 
 lkm)
         rm -f lkm
         mknod lkm c 24 0
-        chown root:kmem lkm
+        chown root.kmem lkm
         chmod 640 lkm
         ;;
 
@@ -448,14 +448,14 @@ audio*)
 	mknod adpcm c 17 0
 	mknod pcm   c 17 64
 	mknod audio c 17 128
-	chown root:wheel adpcm pcm audio
+	chown root.wheel adpcm pcm audio
 	chmod 666 adpcm pcm audio
 	;;
 
 sram)
 	rm -f sram
 	mknod sram c 23 0
-	chown root:wheel sram
+	chown root.wheel sram
 	chmod 644 sram
 	;;
 
@@ -479,7 +479,7 @@ pow*)
 bell*)
 	rm -f bell
 	mknod bell c 33 0
-	chown root:wheel bell 
+	chown root.wheel bell 
 	chmod 666 bell
 	;;