diff --git a/etc/etc.acorn32/MAKEDEV.conf b/etc/etc.acorn32/MAKEDEV.conf
index 21a4460ffc2b..8e893f3b2ace 100644
--- a/etc/etc.acorn32/MAKEDEV.conf
+++ b/etc/etc.acorn32/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/20 17:56:35 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev std_acorn32 wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -18,7 +18,6 @@ ramdisk|floppy)
 	makedev std std_acorn32 fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev tty0 tty1 opty ttyv0
 	makedev st0 st1 cd0 cd1
-	makedev nsmb
 	;;
 
 std_acorn32)
diff --git a/etc/etc.amiga/MAKEDEV.conf b/etc/etc.amiga/MAKEDEV.conf
index 9fe4ece63b07..954282aa2a47 100644
--- a/etc/etc.amiga/MAKEDEV.conf
+++ b/etc/etc.amiga/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev wscons std_amiga fd0 fd1 fd2 fd3 kbd mouse0 mouse1 par0
@@ -18,7 +18,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 fd1 fd2 fd3 kbd opty tun0 tun1
+	makedev std std_amiga fd0 fd1 fd2 fd3 kbd opty tun0 tun1
 	makedev ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 ttye6 ttye7
 	makedev grf0 grf1 grf2 grf3 grf4 grf5 grf6 grf7
 	makedev tty00 ttyA0 ttyB0 ttyC0
diff --git a/etc/etc.atari/MAKEDEV.conf b/etc/etc.atari/MAKEDEV.conf
index 78e5c51e39ab..ec1ffd356d55 100644
--- a/etc/etc.atari/MAKEDEV.conf
+++ b/etc/etc.atari/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev std_atari st0 ttye0 ttye1 ttye2 ttye3 ttye4 ttye5 grf0 grf1
@@ -15,7 +15,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std st0 ttye0 ttye1 ttye2 grf0 grf1 grf2 kbd tun0 tun1
+	makedev std std_atari st0 ttye0 ttye1 ttye2 grf0 grf1 grf2 kbd tun0 tun1
 	makedev sd0 sd1 sd2 sd3 sd4 wd0 wd1 cd0 fd0 md0 md1 rtc
 	makedev ttyA0 ttyA1 ttyB0 opty
 	;;
diff --git a/etc/etc.cats/MAKEDEV.conf b/etc/etc.cats/MAKEDEV.conf
index 9668c6fbecb2..da53ccbbd17e 100644
--- a/etc/etc.cats/MAKEDEV.conf
+++ b/etc/etc.cats/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev wscons std_cats fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -23,7 +23,7 @@ std_cats)
 	;;
 
 ramdisk|floppy)
-	makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std std_cats fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev tty0 tty1 opty ttyv0
 	makedev st0 st1 cd0 cd1
 	makedev bpf0
diff --git a/etc/etc.hpcarm/MAKEDEV.conf b/etc/etc.hpcarm/MAKEDEV.conf
index b203e1a0e113..fdc49c2a1f5f 100644
--- a/etc/etc.hpcarm/MAKEDEV.conf
+++ b/etc/etc.hpcarm/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev wscons std_hpcarm fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -24,7 +24,7 @@ std_hpcarm)
 	;;
 
 ramdisk|floppy)
-	makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std std_hpcarm fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev tty0 tty1 opty ttyv0
 	makedev st0 st1 cd0 cd1
 	;;
diff --git a/etc/etc.ibmnws/MAKEDEV.conf b/etc/etc.ibmnws/MAKEDEV.conf
index af0155a1eceb..a4ed3d2a5559 100644
--- a/etc/etc.ibmnws/MAKEDEV.conf
+++ b/etc/etc.ibmnws/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev sd0 sd1 sd2 sd3 sd4
@@ -10,8 +10,8 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
-	makedev cd0 cd1 ttyE0 opty
+	makedev std sd0 sd1 sd2 tty0 tty1
+	makedev cd0 cd1 opty
 	;;
 
 ramdisk)
diff --git a/etc/etc.mac68k/MAKEDEV.conf b/etc/etc.mac68k/MAKEDEV.conf
index 14ab3348b832..d05a3f766441 100644
--- a/etc/etc.mac68k/MAKEDEV.conf
+++ b/etc/etc.mac68k/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev wscons std_mac68k sd0 sd1 sd2 sd3 wd0 wd1 wd2 wd3 tty0 tty1
@@ -15,7 +15,7 @@ std_mac68k)
 	;;
 
 raminst)
-	makedev std
+	makedev std std_mac68k
 	makedev sd0 sd1 sd2 sd3 wd0 wd1 wd2 wd3 st0 st1 cd0 cd1 md0
 	makedev adb grf0 grf1 ttye0
 	makedev tty0 tty1 opty
diff --git a/etc/etc.mmeye/MAKEDEV.conf b/etc/etc.mmeye/MAKEDEV.conf
index bfa14520827b..4b862e7d74f7 100644
--- a/etc/etc.mmeye/MAKEDEV.conf
+++ b/etc/etc.mmeye/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
@@ -10,8 +10,8 @@ all_md)
 	;;
 
 floppy)
-	makedev std wt0 fd0 fd1 wd0 wd1 sd0 sd1 sd2 tty0 tty1
-	makedev st0 st1 cd0 cd1 mcd0 opty
+	makedev std wd0 wd1 sd0 sd1 sd2 tty0 tty1
+	makedev st0 st1 cd0 cd1 opty
 	;;
 
 ramdisk)
diff --git a/etc/etc.mvmeppc/MAKEDEV.conf b/etc/etc.mvmeppc/MAKEDEV.conf
index 53182fedf9c2..cb777f60afce 100644
--- a/etc/etc.mvmeppc/MAKEDEV.conf
+++ b/etc/etc.mvmeppc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev sd0 sd1 sd2 sd3 sd4
@@ -11,8 +11,8 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
-	makedev cd0 cd1 ttyE0 opty
+	makedev std sd0 sd1 sd2 tty0 tty1
+	makedev cd0 cd1 opty
 	;;
 
 ramdisk)
diff --git a/etc/etc.ofppc/MAKEDEV.conf b/etc/etc.ofppc/MAKEDEV.conf
index f69ededbfbd0..3ab5ab3af119 100644
--- a/etc/etc.ofppc/MAKEDEV.conf
+++ b/etc/etc.ofppc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 11:05:23 jdolecek Exp $
 
 all_md)
 	makedev sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1
@@ -9,7 +9,6 @@ all_md)
 	;;
 
 floppy)
-	makedev std sd0 sd1 sd2 tty00 tty01 opty
+	makedev std sd0 sd1 sd2 opty
 	makedev st0 st1 cd0 cd1 wd0 wd1 md0
-	makedev ttyE0 wsmouse0 wskbd0 ttyEcfg
 	;;
diff --git a/etc/etc.pmppc/MAKEDEV.conf b/etc/etc.pmppc/MAKEDEV.conf
index d8e8f3815f91..b1cc6e7d7727 100644
--- a/etc/etc.pmppc/MAKEDEV.conf
+++ b/etc/etc.pmppc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:24 jdolecek Exp $
 
 all_md)
 	makedev sd0 sd1 sd2 sd3 sd4
@@ -12,7 +12,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
+	makedev std sd0 sd1 sd2 tty0 tty1
 	makedev cd0 cd1 ttyE0 opty
 	;;
 
diff --git a/etc/etc.shark/MAKEDEV.conf b/etc/etc.shark/MAKEDEV.conf
index 191895f1439d..88bca88e11ab 100644
--- a/etc/etc.shark/MAKEDEV.conf
+++ b/etc/etc.shark/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 10:26:44 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.6 2003/10/24 11:05:24 jdolecek Exp $
 
 all_md)
 	makedev wd0 wd1 wd2 wd3
@@ -11,7 +11,7 @@ all_md)
 	;;
 
 ramdisk|floppy)
-	makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1
+	makedev std wd0 wd1 wd2 wd3 md0 md1
 	makedev tty0 tty1 opty ttyv0
 	makedev st0 st1 cd0 cd1
 	;;
diff --git a/etc/etc.sparc/MAKEDEV.conf b/etc/etc.sparc/MAKEDEV.conf
index a78816c3a429..8b5a4787e07d 100644
--- a/etc/etc.sparc/MAKEDEV.conf
+++ b/etc/etc.sparc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:24 jdolecek Exp $
 
 all_md)
 	makedev std_sparc ttya ttyb ttyc ttyd
@@ -29,7 +29,7 @@ std_sparc)
 	;;
 
 floppy|ramdisk)
-	makedev std ttya ttyb ttyc ttyd opty
+	makedev std std_sparc ttya ttyb ttyc ttyd opty
 	makedev sd0 sd1 sd2 sd3 sd4 sd5 md0
 	makedev cd0 cd1 st0 st1 fd0
 	;;
diff --git a/etc/etc.sparc64/MAKEDEV.conf b/etc/etc.sparc64/MAKEDEV.conf
index cd6e4b481b86..b47c49537fc7 100644
--- a/etc/etc.sparc64/MAKEDEV.conf
+++ b/etc/etc.sparc64/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:26 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:24 jdolecek Exp $
 
 all_md)
 	makedev std_sparc64 ttya ttyb ttyc ttyd ttyC00 ttyC01 ttyh0 ttyh1
@@ -30,7 +30,7 @@ std_sparc64)
 	;;
 
 floppy|ramdisk)
-	makedev std ttya ttyb ttyc ttyd opty
+	makedev std std_sparc64 ttya ttyb ttyc ttyd opty
 	makedev sd0 sd1 sd2 sd3 sd4 sd5 md0
 	makedev wd0 wd1 cd0 cd1 st0 st1 fd0
 	makedev random
diff --git a/etc/etc.x68k/MAKEDEV.conf b/etc/etc.x68k/MAKEDEV.conf
index 428cdfd1c3a5..d7b8ebeb2766 100644
--- a/etc/etc.x68k/MAKEDEV.conf
+++ b/etc/etc.x68k/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2003/10/24 08:20:27 jdolecek Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2003/10/24 11:05:24 jdolecek Exp $
 
 all_md)
 	makedev std_x68k st0 st1 ttye0 ttye1 mouse0 mouse1
@@ -19,7 +19,7 @@ std_x68k)
 	;;
 
 floppy)
-	makedev std fd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6
+	makedev std std_x68k fd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6
 	makedev tty00 cd0 ttye0 opty
 	;;