diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 467f702b..beeb1a67 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.6 2002/02/08 19:42:34 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.22 2002/01/23 08:09:30 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.23 2002/02/08 20:26:36 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.68 2002/02/08 19:52:37 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.69 2002/02/08 20:54:35 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index a21d710b..b29c4d0a 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.2 2002/01/23 07:53:01 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.22 2002/01/23 08:09:30 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.23 2002/02/08 20:26:36 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.112 2002/01/23 08:23:19 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.113 2002/02/08 20:54:35 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -206,6 +206,7 @@ M() {
 	return 0
 }
 R() {
+[ "$DEBUG" ] && set -x
 for i in "$@"
 do
 U=`unt $i`
@@ -249,11 +250,11 @@ mouse*)
 
 usbs)
 	R utty0 utty1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
-	R urio0 usb0 usb1
+	R uscanner0 urio0 usb0 usb1
 	;;
 
 radio*)
-	M radio$U     c 76 $U 644
+	M radio$U     c 76 $U
 	MKlist="$MKlist;[ -e radio ] || ln -s radio$U radio"
 	;;
 
@@ -568,8 +569,8 @@ all)
 	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto
 	R pf altq pctr tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 fd1 fd1B fd1C fd1D fd1E fd1F fd1G
-	R fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H rd0 raid0 raid1
-	R raid2 raid3 wd0 wd1 wd2 wd3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1
+	R fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H wd0 wd1 wd2 wd3
+	R rd0 raid0 raid1 raid2 raid3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1
 	R vnd2 vnd3 std cd0 cd1 ch0 st0 st1 pty0 pty1 fd mcd0 sd0 sd1
 	R sd2 sd3 sd4
 	;;
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 661edafa..3da92293 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.2 2002/01/23 07:53:01 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.22 2002/01/23 08:09:30 todd Exp 
+#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.3 2002/02/08 20:26:36 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.23 2002/02/08 20:26:36 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.40 2002/01/23 08:23:19 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.41 2002/02/08 20:54:35 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -165,6 +165,7 @@ M() {
 	return 0
 }
 R() {
+[ "$DEBUG" ] && set -x
 for i in "$@"
 do
 U=`unt $i`
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index a3c83875..59302ed9 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.macppc/MAKEDEV.md,v 1.3 2002/01/23 07:53:01 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.22 2002/01/23 08:09:30 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.23 2002/02/08 20:26:36 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.8 2002/01/23 08:23:19 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.9 2002/02/08 20:54:35 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -185,6 +185,7 @@ M() {
 	return 0
 }
 R() {
+[ "$DEBUG" ] && set -x
 for i in "$@"
 do
 U=`unt $i`
@@ -221,7 +222,7 @@ pci)
 
 usbs)
 	R utty0 utty1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
-	R urio0 usb0 usb1
+	R uscanner0 urio0 usb0 usb1
 	;;
 
 crypto)
@@ -438,7 +439,7 @@ all)
 	R local wscons pci iop0 iop1 usbs audio0 xfs0 ss0 ss1 uk0
 	R rndrandom lkm tty00 tty01 tty02 tty03 apm crypto pf altq
 	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R bpf8 bpf9 rd0 raid0 raid1 raid2 raid3 wd0 wd1 wd2 wd3 ccd0
+	R bpf8 bpf9 wd0 wd1 wd2 wd3 rd0 raid0 raid1 raid2 raid3 ccd0
 	R ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0 cd1 ch0 st0 st1
 	R pty0 pty1 fd sd0 sd1 sd2 sd3 sd4
 	;;
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index d5f9eea3..a82fec15 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc/MAKEDEV.md,v 1.6 2002/01/23 07:53:01 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.22 2002/01/23 08:09:30 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.23 2002/02/08 20:26:36 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.77 2002/01/23 08:23:19 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.78 2002/02/08 20:54:35 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -181,6 +181,7 @@ M() {
 	return 0
 }
 R() {
+[ "$DEBUG" ] && set -x
 for i in "$@"
 do
 U=`unt $i`
@@ -473,7 +474,7 @@ all)
 	R cuac cuad ttya ttyb ttyc ttyd pf altq tun0 tun1 tun2 tun3
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H rd0 xd0 xd1 xd2 xd3 xy0 xy1 xy2 xy3 raid0 raid1
+	R fd0G fd0H xd0 xd1 xd2 xd3 xy0 xy1 xy2 xy3 rd0 raid0 raid1
 	R raid2 raid3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0
 	R cd1 ch0 st0 st1 pty0 pty1 fd sd0 sd1 sd2 sd3 sd4
 	;;
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index a1e125f7..a3929e9c 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -3,11 +3,11 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.13 2002/01/31 22:37:07 jason Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.22 2002/01/23 08:09:30 todd Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.14 2002/02/08 20:26:36 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.23 2002/02/08 20:26:36 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.47 2002/01/31 22:37:31 jason Exp $
+#	$OpenBSD: MAKEDEV,v 1.48 2002/02/08 20:54:35 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -194,6 +194,7 @@ M() {
 	return 0
 }
 R() {
+[ "$DEBUG" ] && set -x
 for i in "$@"
 do
 U=`unt $i`
@@ -350,7 +351,7 @@ ses*)
 
 usbs)
 	R utty0 utty1 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1 uhid2 uhid3
-	R urio0 usb0 usb1
+	R uscanner0 urio0 usb0 usb1
 	;;
 
 uscanner*)
@@ -431,8 +432,8 @@ cua[a-z])
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
-	c) n=4 ;;
-	d) n=5 ;;
+	c) n=2 ;;
+	d) n=3 ;;
 	*) echo unknown cua device $i ;;  
 	esac
 	M cua$u c 12 $(($n+128)) 660 dialer uucp
@@ -443,8 +444,8 @@ tty[a-z])
 	case $u in
 	a) n=0 ;;
 	b) n=1 ;;
-	c) n=4 ;;
-	d) n=5 ;;
+	c) n=2 ;;
+	d) n=3 ;;
 	*) echo unknown tty device $i ;;
 	esac
 	M tty$u c 12 $n 660 dialer uucp
@@ -539,12 +540,12 @@ local)
 	;;
 
 all)
-	R wscons pci usbs audio0 xfs0 ss0 ss1 uk0 ses0 rndrandom lkm
-	R tty00 tty01 tty02 tty03 cuaa cuab cuac cuad ttya ttyb ttyc
-	R ttyd ttyh0 ttyh1 crypto pf altq tun0 tun1 tun2 tun3 bpf0
+	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd wscons pci usbs
+	R audio0 xfs0 ss0 ss1 uk0 ses0 rndrandom lkm tty00 tty01 tty02
+	R tty03 ttyh0 ttyh1 crypto pf altq tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 fd1 fd1B fd1C
 	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
-	R fd0H rd0 raid0 raid1 raid2 raid3 wd0 wd1 wd2 wd3 ccd0 ccd1
+	R fd0H wd0 wd1 wd2 wd3 rd0 raid0 raid1 raid2 raid3 ccd0 ccd1
 	R ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0 cd1 ch0 st0 st1 pty0
 	R pty1 fd sd0 sd1 sd2 sd3 sd4
 	;;
diff --git a/src/etc/etc.sun3/MAKEDEV b/src/etc/etc.sun3/MAKEDEV
index 97dede02..b4a32ea5 100644
--- a/src/etc/etc.sun3/MAKEDEV
+++ b/src/etc/etc.sun3/MAKEDEV
@@ -4,10 +4,10 @@
 # generated from:
 #
 #	OpenBSD: etc.sun3/MAKEDEV.md,v 1.1 2002/01/08 00:59:59 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.22 2002/01/23 08:09:30 todd Exp 
+#	OpenBSD: MAKEDEV.mi,v 1.23 2002/02/08 20:26:36 todd Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.5 2002/01/23 06:02:19 todd Exp 
 #
-#	$OpenBSD: MAKEDEV,v 1.44 2002/01/23 08:23:19 todd Exp $
+#	$OpenBSD: MAKEDEV,v 1.45 2002/02/08 20:54:35 todd Exp $
 #
 # Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
 # All rights reserved.
@@ -168,6 +168,7 @@ M() {
 	return 0
 }
 R() {
+[ "$DEBUG" ] && set -x
 for i in "$@"
 do
 U=`unt $i`
@@ -336,8 +337,8 @@ local)
 all)
 	R local cgfour0 cgtwo0 bwtwo0 xfs0 ss0 ss1 uk0 rndrandom ttya
 	R ttyb ttyc ttyd pf altq tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2
-	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 rd0 xd0 xd1 xd2 xd3 xy0
-	R xy1 xy2 xy3 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0
+	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 xd0 xd1 xd2 xd3 xy0 xy1
+	R xy2 xy3 rd0 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 std cd0
 	R cd1 st0 st1 pty0 pty1 fd sd0 sd1 sd2 sd3 sd4
 	;;