diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index a7598d64..1a7dcc3d 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.12 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.86 2002/05/16 21:12:19 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index 098bb2d4..62fb3fa9 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.amiga/MAKEDEV.md,v 1.8 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.65 2002/05/16 21:12:21 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -268,7 +267,7 @@ mouse*)
 	0|1)
 		M mouse$U c 15 $U
 		if [ $U = 0 ]
-		then 
+		then
 			MKlist="$MKlist;rm -f mouse; ln -s mouse$U mouse"
 		fi
 		;;
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 568f82e9..14cd6d5d 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.hp300/MAKEDEV.md,v 1.8 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.54 2002/05/16 21:12:21 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 235348ab..fb432640 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.hppa/MAKEDEV.md,v 1.8 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.24 2002/05/16 21:12:21 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 0aa38838..a63435d9 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.13 2002/05/16 16:18:44 provos Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.131 2002/05/16 16:19:42 provos Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 55b86a39..a7f9995f 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.8 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.58 2002/05/16 21:12:21 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index d24d5681..888c78ca 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.macppc/MAKEDEV.md,v 1.7 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.28 2002/05/16 21:12:21 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index 4566d6e2..661072de 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.5 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.43 2002/05/16 21:12:22 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index 5e58d680..afac3d5e 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/etc/etc.mvme88k/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.4 2002/05/16 21:11:20 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.20 2002/05/16 21:12:22 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.mvmeppc/MAKEDEV b/src/etc/etc.mvmeppc/MAKEDEV
index f2984ced..43c62abb 100644
--- a/src/etc/etc.mvmeppc/MAKEDEV
+++ b/src/etc/etc.mvmeppc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.7 2002/05/30 06:46:13 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.8 2002/06/09 05:58:39 todd Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -21,7 +21,7 @@
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #	from: @(#)MAKEDEV	5.2 (Berkeley) 6/22/90
-#	$NetBSD: MAKEDEV,v 1.17 1996/02/03 15:02:42 briggs Exp $ 
+#	$NetBSD: MAKEDEV,v 1.17 1996/02/03 15:02:42 briggs Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices.
@@ -148,7 +148,7 @@ case $i in
 
 all)
 	sh $this std fd
-	sh $this wd0 wd1 wd2 wd3 
+	sh $this wd0 wd1 wd2 wd3
 	sh $this sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
 	sh $this vnd0 vnd1 vnd2 vnd3
 	sh $this ccd0 ccd1 ccd2 ccd3
@@ -168,7 +168,7 @@ all)
 
 ramdisk)
 	sh $this std
-	sh $this wd0 wd1 wd2 wd3 
+	sh $this wd0 wd1 wd2 wd3
 	sh $this sd0 sd1 sd2 sd3 sd4 st0 st1 cd0 cd1
 	sh $this rd0
 	sh $this random
@@ -367,7 +367,7 @@ st*)
 	st*) name=st;  chr=20; blk=5;;
 	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 
+		r$name$unit nr$name$unit er$name$unit enr$name$unit
 	case $unit in
 	0|1|2|3|4|5|6)
 		mknod ${name}${unit}	b $blk $(( $unit * 16 + 0 ))
@@ -381,11 +381,11 @@ st*)
 		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} 
+			er${name}${unit} enr${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} 
+			er${name}${unit} enr${name}${unit}
 		;;
 	*)
 		echo bad unit for tape in: $i
@@ -499,12 +499,12 @@ utty*)
 	chmod 660 utty$unit
 	;;
 
- 
+
 ttyCcfg)
 	major=67
 	minor=255
 	rm -f ttyCcfg
-	mknod ttyCcfg c $major $minor  
+	mknod ttyCcfg c $major $minor
 	chown root.wheel ttyCcfg
         ;;
 
@@ -611,7 +611,7 @@ wsmux|wsmouse|wskbd)
 
 wskbd*)
 	unit=${i##*[a-z]}
-	rm -f wskbd${unit} 
+	rm -f wskbd${unit}
 	mknod wskbd${unit} c 68 ${unit}
 	# XXX
 	chmod 660 wskbd${unit}
@@ -619,7 +619,7 @@ wskbd*)
 	;;
 wsmouse*)
 	unit=${i##*[a-z]}
-	rm -f wsmouse${unit} 
+	rm -f wsmouse${unit}
 	mknod wsmouse${unit} c 69 ${unit}
 	# XXX
 	chmod 660 wsmouse${unit}
@@ -628,8 +628,8 @@ wsmouse*)
 
 xfs*)
 	rm -f xfs$unit
-	mknod xfs$unit c 51 $unit 
-	chmod 600 xfs$unit 
+	mknod xfs$unit c 51 $unit
+	chmod 600 xfs$unit
 	chown root.wheel xfs$unit
 	;;
 
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index ebdf1e5b..b31efd9b 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc/MAKEDEV.md,v 1.12 2002/05/16 21:11:21 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.95 2002/05/16 21:12:22 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index b3bfbcc3..c7bef4c1 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.21 2002/05/16 21:11:21 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.67 2002/05/16 21:12:22 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index 4b64c340..87f68a8e 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -4,10 +4,9 @@
 # generated from:
 #
 #	OpenBSD: etc.sun3/MAKEDEV.md,v 1.7 2002/05/16 21:11:21 miod Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.46 2002/05/16 16:18:44 provos Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.47 2002/06/09 04:19:15 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.7 2002/02/16 01:19:52 deraadt Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.60 2002/05/16 21:12:22 miod Exp $
 #
 # Copyright (c) 2001,2002 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -47,7 +46,7 @@
 #	xy*	Xylogic 450/451 disks
 #	xd*	Xylogic 753/7053 disks
 # Terminal ports:
-#	tty[a-z]*	Zilog 8530 Serial Port  
+#	tty[a-z]*	Zilog 8530 Serial Port
 # Pseudo terminals:
 #	tty*	set of 16 slave psuedo terminals
 #	pty*	set of 16 master pseudo terminals
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index d53b5933..03dc9995 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.46 2002/05/16 21:14:49 miod Exp $
+#	$OpenBSD: MAKEDEV,v 1.47 2002/06/09 05:58:39 todd Exp $
 #	$NetBSD: MAKEDEV,v 1.30 2000/01/21 12:28:29 tsutsui Exp $
 #
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
@@ -169,7 +169,7 @@ ht*|tm*|mt*|ts*|ut*)
 		chown root.operator {,r}$name{$four,$twelve}
 		chmod 660 {,n,r,nr}$name{$unit,$eight}
 		chmod 660 {,r}$name{$four,$twelve}
-		if [ $i = ut ] 
+		if [ $i = ut ]
 		then
 			rm -f $name$twenty r$name$twenty
 			mknod $name$twenty	b $blk $twenty
@@ -235,7 +235,7 @@ mt*)
 	case $unit in
 	0|1|2|3|4|5|6|7)
 		eight=`expr $unit + 0`;
-		twelve=`expr $unit + 4`; 
+		twelve=`expr $unit + 4`;
 		sixteen=`expr $unit + 8`;
 		twenty=`expr $unit + 12`;
 		rm -f mt8 mt12 mt16 mt20 nmt8 nrmt8 rmt8 rmt12 rmt16 rmt20
@@ -377,10 +377,10 @@ ch*|uk*)
 rd*)
 	unit=${i#rd}; blk=23; chr=62;
 	rm -f rd${unit}{a,c} #rrd${unit}{a,c}
-	mknod rd${unit}a  b $blk $(($unit * 16 + 0)) 
-	mknod rd${unit}c  b $blk $(($unit * 16 + 2)) 
-#	mknod rrd${unit}a c $chr $(($unit * 16 + 0)) 
-#	mknod rrd${unit}c c $chr $(($unit * 16 + 2)) 
+	mknod rd${unit}a  b $blk $(($unit * 16 + 0))
+	mknod rd${unit}c  b $blk $(($unit * 16 + 2))
+#	mknod rrd${unit}a c $chr $(($unit * 16 + 0))
+#	mknod rrd${unit}c c $chr $(($unit * 16 + 2))
 	chgrp operator rd${unit}? #rrd${unit}?
 	chmod 640 rd${unit}? #rrd${unit}?
 	;;