diff --git a/src/etc/etc.alpha/disktab b/src/etc/etc.alpha/disktab
index 191f1618..21bcc569 100644
--- a/src/etc/etc.alpha/disktab
+++ b/src/etc/etc.alpha/disktab
@@ -1,10 +1,10 @@
-#	$NetBSD: disktab,v 1.1 1995/02/23 05:59:32 cgd Exp $
+#	$NetBSD: disktab,v 1.2 1995/10/13 03:09:39 cgd Exp $
 
 # A DEC RZ25, configured so that all of the free partition IDs are at
 # the end, etc.  A good setup to make a disk image from...
 rz25|RZ25|DEC RZ25 SCSI:\
 	:ty=winchester:dt=SCSI:ns#62:nt#9:nc#1476:\
-	:pa#139500:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
-	:pb#139500:ob#139500:tb=swap:\
+	:pa#111600:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
+	:pb#111600:ob#111600:tb=swap:\
 	:pc#823608:oc#0:\
-	:pd#544608:od#279000:bd#8192:fd#1024:td=4.2BSD:
+	:pd#600408:od#223200:bd#8192:fd#1024:td=4.2BSD:
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index 9aafc78e..8e3e66ee 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.17.2.1 1995/10/20 10:30:08 chopps Exp $
+#	$NetBSD: MAKEDEV,v 1.18 1995/11/28 05:40:18 jtc Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
diff --git a/src/etc/etc.amiga/Makefile.inc b/src/etc/etc.amiga/Makefile.inc
index b9fe9eb9..0a05677e 100644
--- a/src/etc/etc.amiga/Makefile.inc
+++ b/src/etc/etc.amiga/Makefile.inc
@@ -1,7 +1,7 @@
 #
 #	etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
 #
-#	$NetBSD: Makefile.inc,v 1.6.2.2 1995/11/24 19:44:36 chopps Exp $
+#	$NetBSD: Makefile.inc,v 1.7 1995/11/28 05:40:21 jtc Exp $
 
 .ifdef DESTDIR
 snap_md: netbsd-install
diff --git a/src/etc/etc.amiga/disktab b/src/etc/etc.amiga/disktab
index 7168ae94..3363eb6b 100644
--- a/src/etc/etc.amiga/disktab
+++ b/src/etc/etc.amiga/disktab
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: disktab,v 1.3.2.1 1995/11/24 08:00:48 chopps Exp $
+#	$NetBSD: disktab,v 1.4 1995/11/28 05:40:23 jtc Exp $
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/src/etc/etc.atari/ttys b/src/etc/etc.atari/ttys
index 1de4c7db..c51c459a 100644
--- a/src/etc/etc.atari/ttys
+++ b/src/etc/etc.atari/ttys
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ttys,v 1.1.1.1.2.1 1995/11/21 07:21:35 leo Exp $
+#	$NetBSD: ttys,v 1.2 1995/11/28 05:40:26 jtc Exp $
 #
 #	from: @(#)ttys	5.1 (Berkeley) 4/17/89
 #
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 1bc88c97..0f22c23d 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: MAKEDEV,v 1.11.2.1 1995/11/07 08:24:41 thorpej Exp $
+#	$NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 60f88b01..a5a4b3e3 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -135,10 +135,17 @@ fd)
 	;;
 
 wt*)
-	umask 2
-	rm -f wt0 rwt0
-	mknod wt0	b 3 0;	chown root.operator wt0
-	mknod rwt0	c 10 0;	chown root.operator rwt0
+	umask 2 ; unit=`expr $i : '..\(.*\)'`
+	case $i in
+	wt*) name=wt;  chr=10; blk=3;;
+	esac
+	rm -f $name$unit n$name$unit r$name$unit nr$name$unit
+	mknod $name$unit	b $blk `expr $unit '*' 8 + 0`
+	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
+	chmod 640 $name$unit n$name$unit r$name$unit nr$name$unit
 	umask 77
 	;;
 
@@ -211,22 +218,18 @@ st*)
 	esac
 	rm -f $name$unit n$name$unit e$name$unit en$name$unit \
 		r$name$unit nr$name$unit er$name$unit enr$name$unit 
-	mknod ${name}${unit}	b $blk `expr $unit '*' 16 + 0`
-	mknod n${name}${unit}	b $blk `expr $unit '*' 16 + 1`
-	mknod e${name}${unit}	b $blk `expr $unit '*' 16 + 2`
-	mknod en${name}${unit}	b $blk `expr $unit '*' 16 + 3`
-	mknod r${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	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 \
-		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} 
+	mknod $name$unit	b $blk `expr $unit '*' 16 + 0`
+	mknod n$name$unit	b $blk `expr $unit '*' 16 + 1`
+	mknod e$name$unit	b $blk `expr $unit '*' 16 + 2`
+	mknod en$name$unit	b $blk `expr $unit '*' 16 + 3`
+	mknod r$name$unit	c $chr `expr $unit '*' 16 + 0`
+	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 \
+		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 
 	umask 77
 	;;
 
@@ -236,9 +239,9 @@ ch*)
 	ch*) name=ch;  chr=17;;
 	esac
 	rm -f $name$unit
-	mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
-	chgrp operator ${name}${unit}
-	chmod 640 ${name}${unit}
+	mknod $name$unit	c $chr `expr $unit '*' 16 + 0`
+	chgrp operator $name$unit
+	chmod 640 $name$unit
 	umask 77
 	;;
 
@@ -258,33 +261,26 @@ cd*|mcd*)
 	umask 77
 	;;
 
-lpa*)
-	unit=`expr $i : 'lpa\(.*\)'`
-	rm -f lpa$unit
-	mknod lpa$unit c 16 `expr $unit + 128`
-	chown root.wheel lpa$unit
-	;;
-
-lpt*)
-	unit=`expr $i : 'lpt\(.*\)'`
-	rm -f lpt$unit
-	mknod lpt$unit c 16 $unit
-	chown root.wheel lpt$unit
-	;;
-
-bpf*)
-	unit=`expr $i : 'bpf\(.*\)'`
-	rm -f bpf$unit
-	mknod bpf$unit c 23 $unit
-	chown root.wheel bpf$unit
+lpt*|lpa*)
+	unit=`expr $i : '...\(.*\)'`
+	case $i in
+	lpt*) name=lpt; flags=0;;
+	lpa*) name=lpa; flags=128;;
+	esac
+	rm -f $name$unit
+	mknod $name$unit c 16 `expr $unit + $flags`
+	chown root.wheel $name$unit
 	;;
 
-tun*)
-	unit=`expr $i : 'tun\(.*\)'`
-	rm -f tun$unit
-	mknod tun$unit c 40 $unit
-	chmod 600 tun$unit
-	chown root.wheel tun$unit
+bpf*|tun*)
+	unit=`expr $i : '...\(.*\)'`
+	case $i in
+	bpf*) name=bpf; chr=23;;
+	tun*) name=tun; chr=40;;
+	esac
+	rm -f $name$unit
+	mknod $name$unit c $chr $unit
+	chown root.wheel $name$unit
 	;;
 
 speaker)					# (XXX - installed)
@@ -300,25 +296,16 @@ lkm)
 	chmod 640 lkm
 	;;
 
-mms*)
-	unit=`expr $i : 'mms\(.*\)'`
-	rm -f mms$unit
-	mknod mms$unit c 35 $unit
-	chown root.wheel mms$unit
-	;;
-
-lms*)
-	unit=`expr $i : 'lms\(.*\)'`
-	rm -f lms$unit
-	mknod lms$unit c 36 $unit
-	chown root.wheel lms$unit
-	;;
-
-pms*)
-	unit=`expr $i : 'pms\(.*\)'`
-	rm -f pms$unit
-	mknod pms$unit c 37 $unit
-	chown root.wheel pms$unit
+mms*|lms*|pms*)
+	unit=`expr $i : '.ms\(.*\)'`
+	case $i in
+	mms*) name=mms; chr=35;;
+	lms*) name=lms; chr=36;;
+	pms*) name=pms; chr=37;;
+	esac
+	rm -f $name$unit
+	mknod $name$unit c $chr $unit
+	chown root.wheel $name$unit
 	;;
 
 mouse*)						# (XXX)
diff --git a/src/etc/etc.pc532/disktab b/src/etc/etc.pc532/disktab
index 32ff56b1..d6976e92 100644
--- a/src/etc/etc.pc532/disktab
+++ b/src/etc/etc.pc532/disktab
@@ -1,4 +1,4 @@
-# $Id: disktab,v 1.2 1995/10/27 23:58:28 deraadt Exp $
+# $Id: disktab,v 1.3 1995/12/15 02:33:10 deraadt Exp $
 #
 # PC532 version.
 #
diff --git a/src/etc/etc.sparc/disktab b/src/etc/etc.sparc/disktab
index 65d1d7f6..c73868b8 100644
--- a/src/etc/etc.sparc/disktab
+++ b/src/etc/etc.sparc/disktab
@@ -1,4 +1,4 @@
-# $Id: disktab,v 1.4 1995/11/01 17:40:06 deraadt Exp $
+# $Id: disktab,v 1.5 1995/12/15 02:33:11 deraadt Exp $
 #
 #	@(#)disktab	5.5 (Berkeley) 2/27/91
 #
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index 77c217d3..0f7d87ed 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)MAKEDEV	5.5 (Berkeley) 5/28/91
-#	$Id: MAKEDEV,v 1.2 1995/11/23 15:59:42 deraadt Exp $
+#	$Id: MAKEDEV,v 1.3 1995/12/15 02:33:13 deraadt Exp $
 #
 # Device "make" file.  Valid arguments:
 #	std	standard devices
diff --git a/src/etc/etc.sun3/disktab b/src/etc/etc.sun3/disktab
index 4968d46f..8967e511 100644
--- a/src/etc/etc.sun3/disktab
+++ b/src/etc/etc.sun3/disktab
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: disktab,v 1.2.2.1 1995/11/21 21:03:50 gwr Exp $
+#	$NetBSD: disktab,v 1.3 1995/11/21 20:58:33 gwr Exp $
 #
 # Disk geometry and partition layout tables. 
 # Key: