diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index bd3da081..dff9966e 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.45 1999/09/27 22:09:25 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.46 2000/03/22 07:34:27 niklas 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.
@@ -378,7 +378,7 @@ st*)
 		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} \
+	chmod 660 ${name}${unit} n${name}${unit} \
 		e$name$unit en$name$unit \
 		r${name}${unit} nr${name}${unit} \
 		er${name}${unit} enr${name}${unit}
@@ -391,7 +391,7 @@ ch*)
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr $unit
 	chown root.operator ${name}${unit}
-	chmod 640 ${name}${unit}
+	chmod 660 ${name}${unit}
 	umask 77
 	;;
 
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index 69ff3293..7b19ff42 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.43 1999/08/20 17:00:33 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.44 2000/03/22 07:34:27 niklas Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -231,7 +231,7 @@ st*)
 			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} \
+		chmod 660 ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -370,7 +370,7 @@ ch*)
 	rm -f $name$unit
 	mknod $name$unit	c $chr $unit
 	chown root.operator $name$unit
-	chmod 640 $name$unit
+	chmod 660 $name$unit
 	umask 77
 	;;
 
diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
index b6d947aa..7a75ef8f 100644
--- a/src/etc/etc.arc/MAKEDEV
+++ b/src/etc/etc.arc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.32 1999/08/20 17:00:34 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.33 2000/03/22 07:34:28 niklas Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -204,7 +204,7 @@ st*)
 		mknod nr${name}h${unit} c $chr $unit3
 		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} \
+		chmod 660 r${name}${unit} nr${name}${unit} \
 			r${name}h${unit} nr${name}h${unit}
 		;;
 	*)
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
index 47f976ff..846379bd 100644
--- a/src/etc/etc.arm32/MAKEDEV
+++ b/src/etc/etc.arm32/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.16 1999/08/20 17:00:35 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.17 2000/03/22 07:34:28 niklas Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -271,7 +271,7 @@ st*)
 		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} \
+	chmod 660 ${name}${unit} n${name}${unit} \
 		e$name$unit en$name$unit \
 		r${name}${unit} nr${name}${unit} \
 		er${name}${unit} enr${name}${unit} 
@@ -286,7 +286,7 @@ ch*)
 	rm -f $name$unit
 	mknod ${name}${unit}	c $chr $unit
 	chown root.operator ${name}${unit}
-	chmod 640 ${name}${unit}
+	chmod 660 ${name}${unit}
 	umask 77
 	;;
 
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
index 7d76d22b..53d91b55 100644
--- a/src/etc/etc.atari/MAKEDEV
+++ b/src/etc/etc.atari/MAKEDEV
@@ -168,7 +168,7 @@ st*)
 			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} \
+		chmod 660 ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index d05643ca..62621ea4 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.30 1999/08/20 17:00:35 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.31 2000/03/22 07:34:28 niklas Exp $
 #	$NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -167,6 +167,10 @@ ct*|mt*|st*)
 		mknod r${name}${four}	c $chr $four
 		mknod r${name}${eight}	c $chr $eight
 		mknod r${name}${twelve}	c $chr $twelve
+		chown root.operator r${name}${unit} r${name}${four} \
+		    r${name}${eight} r${name}${twelve}
+		chmod 660 r${name}${unit} r${name}${four} \
+		    r${name}${eight} r${name}${twelve}
 		ln r${name}${four} nr${name}${unit} ;: sanity w/pdp11 v7
 		ln r${name}${twelve} nr${name}${eight} ;: ditto
 		;;
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 834eb9fb..eeffae7a 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.1 1999/11/30 21:25:38 mickey Exp $
+#	$OpenBSD: MAKEDEV,v 1.2 2000/03/22 07:34:28 niklas Exp $
 #	@(#)MAKEDEV	5.5 (Berkeley) 5/28/91
 #
 # Device "make" file.  Valid arguments:
@@ -157,7 +157,7 @@ st*)
 	mknod enr$name$unit	c $chr $(($unit * 16 + 3))
 	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 \
+	chmod 660 $name$unit n$name$unit e$name$unit en$name$unit \
 		r$name$unit nr$name$unit er$name$unit enr$name$unit
 	umask 77
 	;;
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 2c80092b..866abe66 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.75 2000/02/21 08:22:44 mjacob Exp $
+#	$OpenBSD: MAKEDEV,v 1.76 2000/03/22 07:34:29 niklas Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -77,6 +77,7 @@
 # Call units:
 #
 # Special purpose devices:
+#	ch*	SCSI media changer
 #	fd	file descriptors
 #	bpf*	packet filter
 #	speaker	pc speaker				(XXX - installed)
@@ -442,7 +443,7 @@ st*)
 	mknod enr$name$unit	c $chr $(( $n + 3 ))
 	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 \
+	chmod 660 $name$unit n$name$unit e$name$unit en$name$unit \
 		r$name$unit nr$name$unit er$name$unit enr$name$unit 
 	umask 77
 	;;
@@ -455,7 +456,7 @@ ch*)
 	rm -f $name$unit
 	mknod $name$unit	c $chr $unit
 	chown root.operator $name$unit
-	chmod 640 $name$unit
+	chmod 660 $name$unit
 	umask 77
 	;;
 
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 9585e8df..d27a0a8f 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.30 1999/08/20 17:00:36 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.31 2000/03/22 07:34:29 niklas Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -39,7 +39,6 @@
 #	fd*	Floppy disk drives (3 1/2", 5 1/4")
 #	sd*	SCSI disks
 #	cd*	SCSI cdrom drives
-#	ch*	SCSI media changer
 #	vnd*	"file" pseudo-disks
 #	ccd*	concatenated disk devices
 #
@@ -56,6 +55,7 @@
 #		CyberVision 64 (grf5)
 #
 # Special purpose devices:
+#	ch*	SCSI media changer
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
 #	lkm	loadable kernel modules interface
@@ -337,7 +337,7 @@ st*)
 			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} \
+		chmod 660 ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -359,7 +359,7 @@ ch*)
 	0|1|2|3|4|5|6)
 		mknod ${name}${unit}	c $chr $unit
 		chown root.operator ${name}${unit}
-		chmod 640 ${name}${unit}
+		chmod 660 ${name}${unit}
 		;;
 	*)
 		echo bad unit for media changer in: $i
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index 13e4294c..0fa5a5e1 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.28 1999/08/20 17:00:36 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.29 2000/03/22 07:34:29 niklas 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.
 #
-#	$OpenBSD: MAKEDEV,v 1.28 1999/08/20 17:00:36 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.29 2000/03/22 07:34:29 niklas Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
@@ -164,7 +164,7 @@ st*)
 			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} \
+		chmod 660 ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index cca9c768..5414f092 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/etc/etc.mvme88k/MAKEDEV
@@ -270,19 +270,28 @@ st*)
 	mknod enr$name$unit	c $chr `expr $unit '*' 16 + 3`
 	chgrp 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 \
+	chmod 660 $name$unit n$name$unit e$name$unit en$name$unit \
 		r$name$unit nr$name$unit er$name$unit enr$name$unit 
 	;;
 
-ch*|uk*)
+ch*)
 	case $i in
 	ch*) name=ch;	unit=${i#ch};	chr=31;;
+	esac
+	rm -f $name$unit
+	mknod $name$unit	c $chr $unit
+	chown root.operator $name$unit
+	chmod 660 $name$unit
+	;;
+
+uk*)
+	case $i in
 	uk*) name=uk;	unit=${i#uk};	chr=34;;
 	esac
 	rm -f $name$unit
 	mknod $name$unit	c $chr $unit
-	chgrp operator $name$unit
-	chmod 640 $name$unit
+	chown root.wheel $name$unit
+	chmod 600 $name$unit
 	;;
 
 cd*)
diff --git a/src/etc/etc.pc532/MAKEDEV b/src/etc/etc.pc532/MAKEDEV
index 7917e095..e1436095 100644
--- a/src/etc/etc.pc532/MAKEDEV
+++ b/src/etc/etc.pc532/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.17 1999/08/20 17:00:36 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.18 2000/03/22 07:34:29 niklas Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -233,7 +233,7 @@ st*)
 		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} \
+	chmod 660 ${name}${unit} n${name}${unit} \
 		e$name$unit en$name$unit \
 		r${name}${unit} nr${name}${unit} \
 		er${name}${unit} enr${name}${unit} 
diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV
index 98372d70..ffa5f814 100644
--- a/src/etc/etc.pmax/MAKEDEV
+++ b/src/etc/etc.pmax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.33 1999/10/07 11:18:10 maja Exp $
+#	$OpenBSD: MAKEDEV,v 1.34 2000/03/22 07:34:29 niklas Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -162,7 +162,8 @@ tz*)
 		mknod nrmt$unit c $chr $unit1
 		mknod rmth$unit c $chr $unit2
 		mknod nrmth$unit c $chr $unit3
-		chmod 666 rmt$unit nrmt$unit rmth$unit nrmth$unit
+		chown root.operator rmt$unit nrmt$unit rmth$unit nrmth$unit
+		chmod 660 rmt$unit nrmt$unit rmth$unit nrmth$unit
 		;;
 	*)
 		echo bad unit for tape in: $1
diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV
index dacdd2e1..02dc2dcd 100644
--- a/src/etc/etc.powerpc/MAKEDEV
+++ b/src/etc/etc.powerpc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.28 2000/02/03 03:06:54 rahnds Exp $
+#	$OpenBSD: MAKEDEV,v 1.29 2000/03/22 07:34:30 niklas Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -39,7 +39,6 @@
 #	wd*	IDE disks
 #	sd*	SCSI disks
 #	cd*	SCSI cdrom drives
-#	ch*	SCSI media changer
 #	vnd*	"file" pseudo-disks
 #	rd*	"ramdisk" pseudo-disks
 #	ccd*	concatenated disk devices
@@ -57,6 +56,7 @@
 #		CyberVision 64 (grf5)
 #
 # Special purpose devices:
+#	ch*	SCSI media changer
 #	bpf*	Berkeley Packet Filter
 #	tun*	network tunnel driver
 #	lkm	loadable kernel modules interface
@@ -366,11 +366,11 @@ st*)
 		mknod nr${name}${unit}	c $chr $(( $unit * 16 + 1 ))
 		mknod er${name}${unit}	c $chr $(( $unit * 16 + 2 ))
 		mknod enr${name}${unit}	c $chr $(( $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} 
-		chmod 640 ${name}${unit} n${name}${unit} \
+		chmod 660 ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit} 
@@ -391,8 +391,8 @@ ch*)
 	case $unit in
 	0|1|2|3|4|5|6)
 		mknod ${name}${unit}	c $chr $unit
-		chgrp operator ${name}${unit}
-		chmod 640 ${name}${unit}
+		chown root.operator ${name}${unit}
+		chmod 660 ${name}${unit}
 		;;
 	*)
 		echo bad unit for media changer in: $i
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index dff7542d..e617823d 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.61 2000/02/21 08:22:08 mjacob Exp $
+#	$OpenBSD: MAKEDEV,v 1.62 2000/03/22 07:34:30 niklas Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -46,10 +46,6 @@
 # Disks:
 #	sd*	SCSI disks
 #	cd*	SCSI cdrom drives
-#	ch*	SCSI media changer
-#	uk*	SCSI Unknown device
-#	ses*	SCSI SES/SAF-TE device
-#	ss*	SCSI scanners
 #	xy*	Xylogic 450/451 disks
 #	rd*	"ramdisk" pseudo-disks
 #	xd*	Xylogic 753/7053 disks
@@ -68,6 +64,10 @@
 #	cua[a-d]	onboard zs serial ports
 #
 # Special purpose devices:
+#	ch*	SCSI media changer
+#	uk*	SCSI Unknown device
+#	ses*	SCSI SES/SAF-TE device
+#	ss*	SCSI scanners
 #	audio	
 #	openprom	
 #	bwtwo*	
@@ -522,7 +522,7 @@ st*)
 		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 \
+	chmod 660 $name$unit n$name$unit \
 		e$name$unit en$name$unit \
 		r$name$unit nr$name$unit \
 		er$name$unit enr$name$unit 
@@ -537,7 +537,7 @@ ch*)
 	rm -f $name$unit
 	mknod $name$unit	c $chr $unit
 	chown root.operator $name$unit
-	chmod 640 $name$unit
+	chmod 660 $name$unit
 	umask 77
 	;;
 
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index a1352237..70f2abb3 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.27 2000/03/02 22:59:05 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.28 2000/03/22 07:34:30 niklas Exp $
 #	$NetBSD: MAKEDEV,v 1.8 1996/03/03 16:54:17 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -210,10 +210,10 @@ cd*|sd*|xy*|ccd*|rd*|vnd*)
 st*)
 	name=st; blk=11; chr=18;
 	offset=`expr $unit \* 16`;
-	mk   r$name$unit c $chr `expr $offset + 0`
-	mk  nr$name$unit c $chr `expr $offset + 1`
-	mk  er$name$unit c $chr `expr $offset + 2`
-	mk enr$name$unit c $chr `expr $offset + 3`
+	mk   r$name$unit c $chr `expr $offset + 0` 660 operator
+	mk  nr$name$unit c $chr `expr $offset + 1` 660 operator
+	mk  er$name$unit c $chr `expr $offset + 2` 660 operator
+	mk enr$name$unit c $chr `expr $offset + 3` 660 operator
 	;;
 
 bwtwo*)
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 0fc7c0b7..a09b83cc 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.17 1998/11/19 08:18:58 dugsong Exp $
+#	$OpenBSD: MAKEDEV,v 1.18 2000/03/22 07:34:30 niklas Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/01/07 16:53:15 ragge Exp $
 #
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
@@ -128,11 +128,17 @@ ht*|tm*|tms*|ts*|ut*|st*)
 		mknod r$name$four	c $chr $four
 		mknod r$name$eight	c $chr $eight
 		mknod r$name$twelve	c $chr $twelve
+		chown root.operator {,n,r,nr}$name{$unit,$eight}
+		chown root.operator {,r}$name{$four,$twelve}
+		chmod 660 {,n,r,nr}$name{$unit,$eight}
+		chmod 660 {,r}$name{$four,$twelve}
 		if [ $i = ut ] 
 		then
 			rm -f $name$twenty r$name$twenty
 			mknod $name$twenty	b $blk $twenty
 			mknod r$name$twenty	c $chr $twenty
+			chown root.operator {,r}$name$twenty
+			chmod 660 {,r}$name$twenty
 		fi
 		if [ ! -e rmt$eight ]	# compatibility stuff
 		then
@@ -185,6 +191,10 @@ mt*)
 		mknod rmt20		c $chr $twenty
 		mknod nmt16		b $blk $twenty ;: ditto
 		mknod nrmt16		c $chr $twenty ;: ditto
+		chown root.operator {,n,r,nr}mt{8,16}
+		chown root.operator {,r}mt{12,20}
+		chmod 660 {,n,r,nr}mt{8,16}
+		chmod 660 {,r}mt{12,20}
 		;;
 	*)
 		echo bad unit for tape in: $1
diff --git a/src/etc/etc.wgrisc/MAKEDEV b/src/etc/etc.wgrisc/MAKEDEV
index 4da38c83..677b688b 100644
--- a/src/etc/etc.wgrisc/MAKEDEV
+++ b/src/etc/etc.wgrisc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.9 1999/08/20 17:00:37 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.10 2000/03/22 07:34:30 niklas Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -90,7 +90,7 @@ st*)
 		mknod nr${name}h${unit} c $chr $unit3
 		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} \
+		chmod 660 r${name}${unit} nr${name}${unit} \
 			r${name}h${unit} nr${name}h${unit}
 		;;
 	*)
diff --git a/src/etc/etc.x68k/MAKEDEV b/src/etc/etc.x68k/MAKEDEV
index e30fb1f3..923adb52 100644
--- a/src/etc/etc.x68k/MAKEDEV
+++ b/src/etc/etc.x68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.14 2000/03/01 21:25:04 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.15 2000/03/22 07:34:31 niklas 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.
@@ -158,7 +158,7 @@ st*)
 			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} \
+		chmod 660 ${name}${unit} n${name}${unit} \
 			e$name$unit en$name$unit \
 			r${name}${unit} nr${name}${unit} \
 			er${name}${unit} enr${name}${unit}