diff --git a/src/etc/MAKEDEV.mi b/src/etc/MAKEDEV.mi
index b0bde22e..20f9b00e 100644
--- a/src/etc/MAKEDEV.mi
+++ b/src/etc/MAKEDEV.mi
@@ -1,6 +1,6 @@
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.31 2002/02/14 17:44:38 todd Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.32 2002/02/15 21:13:47 todd Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -113,39 +113,19 @@ dnl necessary devices.  Otherwise the devices are not included in the 'all'
 dnl target.  Note this keeps line lengths to less than column 70.  For the
 dnl gory details see the definition of '_dl' in MAKEDEV.sub
 dnl
-twrget(all, attyB, sd, 5, 6, 7, 8, 9)dnl
-target(all, sd, 0, 1, 2, 3, 4)dnl
 target(all, mcd, 0)dnl
 twrget(all, fdesc, fd)dnl
-target(all, pty, 0, 1, 2)dnl
 target(all, st, 0, 1)dnl
-target(all, ch, 0)dnl
-target(all, cd, 0, 1)dnl
 target(all, mcd, 0)dnl
 target(all, std)dnl
-target(all, vnd, 0, 1, 2, 3)dnl
-target(all, ccd, 0, 1, 2, 3)dnl
 target(all, raid, 0, 1, 2, 3)dnl
-target(all, rd, 0)dnl
 target(all, rz, 0, 1, 2, 3, 4)dnl
-target(all, hk, 0, 1, 2, 3)dnl
 target(all, hp, 0, 1, 2, 3)dnl
-target(all, ht, 0)dnl
 target(all, ra, 0, 1, 2, 3)dnl
-target(all, rb, 0, 1, 2, 3)dnl
-target(all, rl, 0, 1, 2, 3)dnl
 target(all, rx, 0, 1)dnl
-target(all, tm, 0)dnl
-target(all, up, 0, 1, 2, 3)dnl
-target(all, ut, 0)dnl
 target(all, wd, 0, 1, 2, 3)dnl
-target(all, xy, 0, 1, 2, 3)dnl
 target(all, xd, 0, 1, 2, 3)dnl
-twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
-twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
 twrget(all, aflo, fd, 0, 1, 2, 3)dnl
-target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
-target(all, tun, 0, 1, 2, 3)dnl
 target(all, pctr)dnl
 target(all, pctr0)dnl
 target(all, altq)dnl
@@ -170,13 +150,10 @@ target(all, lpt, 0, 1, 2)dnl
 twrget(all, lpt, lpa, 0, 1, 2)dnl
 target(all, joy, 0, 1)dnl
 target(all, rnd, random)dnl
-target(all, ses, 0)dnl
 target(all, uk, 0)dnl
-target(all, ss, 0, 1)dnl
 target(all, st, 0)dnl
 target(all, wt, 0)dnl
 target(all, wdt, 0)dnl
-target(all, xfs, 0)dnl
 twrget(all, au, audio, 0)dnl
 twrget(all, speak, speaker)dnl
 target(all, asc, 0)dnl
@@ -302,6 +279,21 @@ _mkdev(ramd, ramdisk, {-dnl
 show_target(ramd)dnl
 -})dnl
 ifelse(MACHINE, mvmeppc, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, tty0, 0, 1, 2, 3)dnl
 twrget(ramd, wsdisp, ttyC, 0)dnl
 target(ramd, rd, 0)dnl
@@ -313,12 +305,43 @@ target(ramd, bpf, 0)dnl
 target(ramd, rd, 0)dnl
 -})dnl
 ifelse(MACHINE, sparc, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, hk, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, fd, 0)dnl
 target(ramd, sd, 0, 1, 2, 3)dnl
 target(ramd, rd, 0)dnl
 target(ramd, cd, 0)dnl
 -})dnl
 ifelse(MACHINE, sparc64, {-dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
 target(ramd, fd, 0)dnl
 target(ramd, rd, 0)dnl
 target(ramd, sd, 0, 1, 2, 3)dnl
@@ -350,6 +373,21 @@ _mkdev(s64_czs, cua[a-z], {-u=${i#cua*}
 	M cua$u c major_s64_czs_c Add($n, 128) 660 dialer uucp-})dnl
 -})dnl
 ifelse(MACHINE, i386, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, tty0, 0, 1, 2, 3)dnl
 twrget(ramd, wsdisp, ttyC, 0)dnl
 target(ramd, wt, 0)dnl
@@ -362,6 +400,21 @@ target(ramd, st, 0, 1)dnl
 target(ramd, mcd, 0)dnl
 -})dnl
 ifelse(MACHINE, alpha, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, sd, 0, 1, 2)dnl
 target(ramd, wd, 0)dnl
 target(ramd, tty0, 0, 1)dnl
@@ -371,6 +424,21 @@ target(ramd, ttyB, 0, 1)dnl
 target(ramd, ttyE, 0, 1)dnl
 -})dnl
 ifelse(MACHINE, amiga, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, kbd)dnl
 target(ramd, pty, 0)dnl
 target(ramd, tty0, 0)dnl
@@ -385,6 +453,20 @@ target(ramd, wd, 0, 1)dnl
 target(ramd, rd, 0)dnl
 -})dnl
 ifelse(MACHINE, hp300, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
 _mkdev(st_hp300, ct*|mt*|st*,
 {-case $i in
 	ct*) name=ct blk=major_ct_b chr=major_ct_c;;
@@ -409,6 +491,7 @@ _mkdev(st_hp300, ct*|mt*|st*,
 	esac-})dnl
 __devitem(st_hp300, st*, Exabyte tape)dnl
 __devitem(grf, grf*, raw interface to HP300 graphics devices)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target( all, grf, 0)dnl
 dnl XXX target( all, hil, 0, 1, 2, 3, 4, 5, 6, 7)dnl
 target( all, hil, )dnl
@@ -433,6 +516,21 @@ target(ramd, bpf, 0, 1)dnl
 target(ramd, tun, 0, 1)dnl
 -})dnl
 ifelse(MACHINE, hppa, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, st, 0, 1)dnl
 target(ramd, sd, 0, 1, 2, 3)dnl
 target(ramd, rd, 0, 1)dnl
@@ -443,6 +541,21 @@ target(ramd, bpf, 0, 1)dnl
 target(ramd, tun, 0, 1)dnl
 -})dnl
 ifelse(MACHINE, mac68k, {-dnl
+target(all, ses, 0)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, sd, 0, 1, 2, 3)dnl
 target(ramd, st, 0, 1)dnl
 target(ramd, adb)dnl
@@ -453,6 +566,21 @@ twrget(ramd, mac_tty0, tty0, 0, 1)dnl
 target(ramd, pty, 0)dnl
 -})dnl
 ifelse(MACHINE, macppc, {-dnl
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
 target(ramd, sd, 0, 1, 2, 3, 4)dnl
 target(ramd, wd, 0, 1, 2, 3, 4)dnl
 target(ramd, st, 0, 1)dnl
@@ -462,7 +590,40 @@ target(ramd, ttyE, 0)dnl
 target(ramd, tty0, 0, 1)dnl
 target(ramd, pty, 0)dnl
 -})dnl
+ifelse(MACHINE, sun3, {-
+target(all, ses, 0)dnl
+target(all, ch, 0)dnl
+target(all, ss, 0, 1)dnl
+target(all, xfs, 0)dnl
+twrget(all, flo, fd, 0, 0B, 0C, 0D, 0E, 0F, 0G, 0H)dnl
+twrget(all, flo, fd, 1, 1B, 1C, 1D, 1E, 1F, 1G, 1H)dnl
+target(all, pty, 0, 1, 2)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)dnl
+target(all, tun, 0, 1, 2, 3)dnl
+target(all, xy, 0, 1, 2, 3)dnl
+target(all, hk, 0, 1, 2, 3)dnl
+target(all, rd, 0)dnl
+target(all, cd, 0, 1)dnl
+target(all, sd, 0, 1, 2, 3, 4)dnl
+target(all, vnd, 0, 1, 2, 3)dnl
+target(all, ccd, 0, 1, 2, 3)dnl
+-})dnl
 ifelse(MACHINE, vax, {-
+dnl target(all, ses, 0)dnl
+dnl target(all, ut, 0)dnl
+dnl target(all, ch, 0)dnl
+target(all, ss, 0)dnl
+dnl target(all, xfs, 0)dnl
+target(all, pty, 0, 1)dnl
+target(all, bpf, 0, 1, 2, 3, 4, 5, 6, 7)dnl
+target(all, tun, 0, 1)dnl
+dnl target(all, xy, 0, 1, 2, 3)dnl
+dnl target(all, hk, 0, 1, 2, 3)dnl
+dnl target(all, up, 0, 1, 2, 3)dnl
+dnl target(all, rd, 0)dnl
+target(all, cd, 0)dnl
+target(all, sd, 0, 1, 2, 3)dnl
+target(all, vnd, 0)dnl
 __devitem(dhu, dhu*, unibus dhu11)dnl
 __devitem(dmz, dmz*, unibus dmz32)dnl
 __devitem(dmf, dmf*, unibus dmf32)dnl
@@ -541,15 +702,16 @@ dl*)
 		echo bad number for ${name}: $U
 	fi-})dnl
 dnl
+target( all, ccd, 0)dnl
 target( all, hd, 0, 1, 2)dnl
 target( all, mt, 0, 1)dnl
 target( all, ts, 0, 1)dnl
 target( all, uu, 0)dnl
 target( all, st, 0, 1)dnl
 target( all, dhu, 0)dnl
-target( all, dmz, 0)dnl
-target( all, dmf, 0)dnl
-target( all, dh, 0)dnl
+dnl target( all, dmz, 0)dnl
+dnl target( all, dmf, 0)dnl
+dnl target( all, dh, 0)dnl
 target( all, dz, 0)dnl
 target( all, dl, 0)dnl
 target( all, vt, 0)dnl
diff --git a/src/etc/etc.vax/MAKEDEV.md b/src/etc/etc.vax/MAKEDEV.md
index 176e2d04..7745d8c9 100644
--- a/src/etc/etc.vax/MAKEDEV.md
+++ b/src/etc/etc.vax/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.5 2002/02/14 17:44:38 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.6 2002/02/15 21:13:47 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001 Todd T. Fries <todd@OpenBSD.org>
@@ -50,9 +50,7 @@ _DEV(cd, 61, 22)
 _DEV(ch, 63)
 _DEV(ss, 64)
 _DEV(uk, 65)
-_DEV(xy, 9, 3)
-_DEV(rd, 106, 23)
-_DEV(xd, 42, 10)
+_DEV(rd, 62, 23)
 _DEV(flo, 54, 16)
 _DEV(vnd, 55, 18)
 _DEV(ccd, 54, 17)