diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 4451cd79..7fcae797 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.43 1999/07/30 18:49:35 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.44 1999/08/20 17:00:33 downsj 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.
@@ -319,7 +319,8 @@ ttyB*|ttyC*|ttyc*)
         rm -f tty$type$unit cua$type$unit
         mknod tty$type$unit c $major $minor
         mknod cua$type$unit c $major `add $minor 128`
-        chown uucp.wheel tty$type$unit cua$type$unit
+        chown uucp.dialer tty$type$unit cua$type$unit
+	chmod 660 tty$type$unit cua$type$unit
         ;;
 
 pty*)
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index eab587c0..69ff3293 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.42 1999/07/30 18:49:35 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.43 1999/08/20 17:00:33 downsj Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -406,7 +406,8 @@ tty0*|ttyA*)
 			rm -f tty0${unit} cua0${unit}
 			mknod tty0${unit} c 12 0
 			mknod cua0${unit} c 12 128
-			chown uucp.wheel tty0${unit} cua0${unit}
+			chown uucp.dialer tty0${unit} cua0${unit}
+			chmod 660 tty0${unit} cua0${unit}
 			;;
 		*)
 			echo bad unit for tty0 in: $i
@@ -418,7 +419,8 @@ 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.dialer ttyA${unit} ttyM${unit}
+			chmod 660 ttyA${unit} ttyM${unit}
 			;;
 		*)
 			echo bad unit for ttyA in: $i
@@ -568,7 +570,8 @@ ttyB*)
 	rm -f ttyB$unit cuaB$unit
 	mknod ttyB$unit c 32 $unit
 	mknod cuaB$unit c 32 `expr $unit + 128`
-	chown uucp.wheel ttyB$unit cuaB$unit
+	chown uucp.dialer ttyB$unit cuaB$unit
+	chmod 660 ttyB$unit cuaB$unit
 	;;
 
 lpt*|lpa*)
diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
index 5d67ef83..b6d947aa 100644
--- a/src/etc/etc.arc/MAKEDEV
+++ b/src/etc/etc.arc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.31 1999/07/30 18:49:36 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.32 1999/08/20 17:00:34 downsj Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -398,7 +398,8 @@ tty*)
 	rm -f tty$unit cua$unit
 	mknod tty$unit c 17 $unit
 	mknod cua$unit c 17 `expr $unit + 128`
-	chown uucp.wheel tty$unit cua$unit
+	chown uucp.dialer tty$unit cua$unit
+	chmod 660 tty$unit cua$unit
 	;;
 
 pty*)
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
index 29aad521..47f976ff 100644
--- a/src/etc/etc.arm32/MAKEDEV
+++ b/src/etc/etc.arm32/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.15 1998/11/25 04:58:53 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.16 1999/08/20 17:00:35 downsj Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -214,7 +214,8 @@ com*|tty*)					# (XXX -- com should die)
 	unit=`expr $i : '...\(.*\)'`
 	rm -f com$unit tty0$unit
 	mknod tty0$unit c 12 $unit
-	chown uucp.wheel tty0$unit
+	chown uucp.dialer tty0$unit
+	chmod 660 tty0$unit
 	;;
 
 pty*)
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
index 59d18286..7d76d22b 100644
--- a/src/etc/etc.atari/MAKEDEV
+++ b/src/etc/etc.atari/MAKEDEV
@@ -136,13 +136,15 @@ fd)
 ser02)
 	rm -f ser02
 	mknod ser02 c 7 0
-	chown uucp.wheel ser02
+	chown uucp.dialer ser02
+	chmod 660 ser02
 	;;
 
 mdm02)
 	rm -f mdm02
 	mknod mdm02 c 7 16
-	chown uucp.wheel mdm02
+	chown uucp.dialer mdm02
+	chmod 660 mdm02
 	;;
 
 st*)
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 271a2a6c..d05643ca 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.29 1998/11/19 08:18:56 dugsong Exp $
+#	$OpenBSD: MAKEDEV,v 1.30 1999/08/20 17:00:35 downsj Exp $
 #	$NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -320,6 +320,8 @@ dca*)
 		rm -f tty${unit} cua${unit}
 		mknod tty${unit} c 12 ${unit}
 		mknod cua${unit} c 12 `expr ${unit} + 128`
+		chown uucp.dialer tty${unit} cua${unit}
+		chmod 660 tty${unit} cua${unit}
 		;;
 	*)
 		echo bad unit for dca in: $i
@@ -341,6 +343,8 @@ dcm*)
 			rm -f {tty0,cua0}${ext}
 			mknod tty0${ext} c 15 ${n}
 			mknod cua0${ext} c 15 "$(( $n + 128 ))"
+			chown uucp.dialer tty0${ext} cua0${ext}
+			chmod 660 tty0${ext} cua0${ext}
 
 			i="$(( $i + 1 ))"
 		done
@@ -360,6 +364,8 @@ apci*)
 			rm -f ttya${i} cuaa${i}
 			mknod ttya${i} c 35 ${i}
 			mknod cuaa${i} c 35 `expr ${i} + 128`
+			chown uucp.dialer ttya${i} cuaa${i}
+			chmod 660 ttya${i} cuaa${i}
 		done
 		;;
 	*)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 66bd9d94..bfaa0b8a 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.72 1999/08/13 05:39:24 fgsch Exp $
+#	$OpenBSD: MAKEDEV,v 1.73 1999/08/20 17:00:36 downsj Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -217,7 +217,8 @@ ttyc*)
 	rm -f ttyc$unit cuac$unit
 	mknod ttyc$unit c 38 $unit
 	mknod cuac$unit c 38 `expr $unit + 128`
-	chown uucp.wheel ttyc$unit cuac$unit
+	chown uucp.dialer ttyc$unit cuac$unit
+	chmod 660 ttyc$unit cuac$unit
         ;;
 
 fd)
@@ -419,7 +420,8 @@ tty0*)
 	rm -f com0$unit tty0$unit cua0$unit
 	mknod tty0$unit c 8 $unit
 	mknod cua0$unit c 8 `expr $unit + 128`
-	chown uucp.wheel tty0$unit cua0$unit
+	chown uucp.dialer tty0$unit cua0$unit
+	chmod 660 tty0$unit cua0$unit
 	;;
 
 pty*)
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 83c652cc..9585e8df 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.29 1999/05/01 06:28:47 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.30 1999/08/20 17:00:36 downsj Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -255,7 +255,8 @@ tty0*)
 	case ${unit} in
 	0|1)
 		mknod tty0${unit} c 12 ${unit}
-		chown uucp.wheel tty0${unit}
+		chown uucp.dialer tty0${unit}
+		chmod 660 tty0${unit}
 		;;
 	*)
 		echo bad unit for serial tty in: $i
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index f6c806ff..13e4294c 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.27 1998/11/25 04:58:54 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.28 1999/08/20 17:00:36 downsj 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.27 1998/11/25 04:58:54 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.28 1999/08/20 17:00:36 downsj Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
@@ -306,7 +306,8 @@ ttyw*|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.dialer tty0${unit} cua0${unit}
+			chmod 660 tty0${unit} cua0${unit}
 			;;
 		*)
 			echo bad unit for tty0 in: $i
@@ -320,7 +321,8 @@ ttyw*|tty0*|ttya|ttyb|ttyc|ttyd)
 			rm -f ttyw${unit} cuaw${unit}
 			mknod ttyw${unit} c 30 ${unit}
 			mknod cuaw${unit} c 30 `expr 128 + ${unit}`
-			chown uucp.wheel ttyw${unit} cuaw${unit}
+			chown uucp.dialer ttyw${unit} cuaw${unit}
+			chmod 660 ttyw${unit} cuaw${unit}
 			;;
 		*)
 			echo bad unit for ttyw in: $i
@@ -333,7 +335,8 @@ ttyw*|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.dialer tty${unit} cua${unit}
+		chmod 660 tty${unit} cua${unit}
 		;;
 	*)
 		echo bad type for tty in: $i
diff --git a/src/etc/etc.pc532/MAKEDEV b/src/etc/etc.pc532/MAKEDEV
index 2bbbd7f8..7917e095 100644
--- a/src/etc/etc.pc532/MAKEDEV
+++ b/src/etc/etc.pc532/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.16 1998/11/25 04:58:54 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.17 1999/08/20 17:00:36 downsj Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -176,7 +176,8 @@ vnd*)
 tty*)
 	unit=`expr $i : '...\(.*\)'`
 	mknod tty0$unit c 8 $unit
-	chown uucp.wheel tty0$unit
+	chown uucp.dialer tty0$unit
+	chmod 660 tty0$unit
 	;;
 
 pty*)
diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV
index d1092595..0ba5cf4e 100644
--- a/src/etc/etc.pmax/MAKEDEV
+++ b/src/etc/etc.pmax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.30 1998/11/25 04:58:54 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.31 1999/08/20 17:00:37 downsj Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -314,6 +314,8 @@ dc*)
 	0)
 		mknod tty00 c 16 2
 		mknod tty01 c 16 3
+		chown uucp.dialer tty00 tty01
+		chmod 660 tty00 tty01
 		;;
 	*)
 		echo bad unit for dc in: $i
@@ -327,6 +329,8 @@ scc*)
 	0)
 		mknod tty00 c 17 0
 		mknod tty01 c 17 2
+		chown uucp.dialer tty00 tty01
+		chmod 660 tty00 tty01
 		;;
 	*)
 		echo bad unit for scc in: $i
diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV
index 98f5925f..64c61308 100644
--- a/src/etc/etc.powerpc/MAKEDEV
+++ b/src/etc/etc.powerpc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.26 1998/11/25 04:58:55 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.27 1999/08/20 17:00:37 downsj Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -290,7 +290,8 @@ ttyo*)
 	case ${unit} in
 	0|1)
 		mknod ttyo${unit} c 14 ${unit}
-		chown uucp.wheel ttyo${unit}
+		chown uucp.dialer ttyo${unit}
+		chmod 660 ttyo${unit}
 		;;
 	*)
 		echo bad unit for serial tty in: $i
@@ -302,7 +303,8 @@ tty0*)
 	rm -f tty0$unit cua0$unit
 	mknod tty0$unit c 7 $unit
 	mknod cua0$unit c 7 `expr $unit + 128`
-	chown uucp.wheel tty0$unit cua0$unit
+	chown uucp.dialer tty0$unit cua0$unit
+	chmod 660 tty0$unit cua0$unit
 	;;
 
 pty*)
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index aa85894a..f6f49e31 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.58 1999/07/18 17:07:48 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.59 1999/08/20 17:00:37 downsj Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -557,7 +557,8 @@ tty[a-z])
 	*) echo unknown tty device $i ;;
 	esac
 	mknod tty$unit c 12 $n
-	chown uucp.wheel tty$unit
+	chown uucp.dialer tty$unit
+	chmod 660 tty$unit
 	;;
 
 cua[a-z])
@@ -571,7 +572,8 @@ cua[a-z])
 	*) echo unknown cua device $i ;;
 	esac
 	mknod cua$unit c 12 `add $n 128`
-	chown uucp.wheel cua$unit
+	chown uucp.dialer cua$unit
+	chmod 660 cua$unit
 	;;
 
 pty*)
@@ -625,7 +627,8 @@ spif*)
 	do
 		name=$nam`hex $n`
 		mknod tty$name c 102 `add $offset $n`
-		chown uucp.wheel tty$name
+		chown uucp.dialer tty$name
+		chmod 660 tty$name
 		n=`add $n 1`
 	done
 	mknod bpps${unit}0 c 103 `add $offset 0`
@@ -645,7 +648,8 @@ magma*)
 	do
 		name=$nam`hex $n`
 		mknod tty$name c 100 `add $offset $n`
-		chown uucp.wheel tty$name
+		chown uucp.dialer tty$name
+		chmod 660 tty$name
 		n=`add $n 1`
 	done
 	mknod bppm${unit}0 c 101 `add $offset 0`
diff --git a/src/etc/etc.wgrisc/MAKEDEV b/src/etc/etc.wgrisc/MAKEDEV
index 5e849eb3..4da38c83 100644
--- a/src/etc/etc.wgrisc/MAKEDEV
+++ b/src/etc/etc.wgrisc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.8 1998/11/25 04:58:55 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.9 1999/08/20 17:00:37 downsj Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -216,7 +216,8 @@ tty*)
 	rm -f tty$unit cua$unit
 	mknod tty$unit c 17 $unit
 	mknod cua$unit c 17 `expr $unit + 128`
-	chown uucp.wheel tty$unit cua$unit
+	chown uucp.dialer tty$unit cua$unit
+	chmod 660 tty$unit cua$unit
 	;;
 
 pty*)
diff --git a/src/etc/etc.x68k/MAKEDEV b/src/etc/etc.x68k/MAKEDEV
index 06c6fc17..3a382ced 100644
--- a/src/etc/etc.x68k/MAKEDEV
+++ b/src/etc/etc.x68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.12 1998/11/25 04:58:55 millert Exp $
+#	$OpenBSD: MAKEDEV,v 1.13 1999/08/20 17:00:38 downsj 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.12 1998/11/25 04:58:55 millert Exp $
+#	$Id: MAKEDEV,v 1.13 1999/08/20 17:00:38 downsj Exp $
 #
 #	from:
 #	hp300/MAKEDEV (1/15/94), from:
@@ -310,7 +310,8 @@ 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.dialer tty0${unit} ttym${unit}
+		chmod 660 tty0${unit} ttym${unit}
 		;;
 	*)
 		echo bad unit for ser in: $i
@@ -326,7 +327,8 @@ com*)
 	0|1)
 		rm -f com${unit}
 		mknod com${unit} c 16 $unit
-		chown uucp.wheel com${unit}
+		chown uucp.dialer com${unit}
+		chmod 660 com${unit}
 		;;
 	*)
 		echo bad unit for com in: $i
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index f3a12f67..98f15c6c 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.78 1999/08/02 19:50:09 jakob Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.79 1999/08/20 17:00:38 downsj Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -1790,7 +1790,7 @@ hidden           mode=0111
 ..
 
 # ./var/spool/lock
-lock		uname=uucp gname=daemon
+lock		uname=uucp gname=dialer mode=1775
 # ./var/spool/lock
 ..