diff --git a/src/etc/MAKEDEV.mi b/src/etc/MAKEDEV.mi
index c3663fc3..0eeff4d0 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.34 2002/02/17 05:14:30 deraadt Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.35 2002/02/19 21:03:18 todd Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -327,6 +327,7 @@ target(ramd, rd, 0)dnl
 target(ramd, cd, 0)dnl
 -})dnl
 ifelse(MACHINE, sparc64, {-dnl
+twrget(wscons, wscons, ttyD, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
 target(all, ccd, 0, 1, 2, 3)dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
@@ -816,19 +817,24 @@ __devitem(ttyv, ttyv*, pcvt)dnl
 __devitem(ttye, ttye*, ite bitmapped consoles)dnl
 __devitem(mac_ttye, ttye*, ite bitmapped consoles)dnl
 __devitem(wscons, ttyC0, wscons screen 0)dnl
+twrget(wscons, wscons, ttyC, cfg, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b)dnl
+target(wscons, wsmux)dnl
+target(wscons, wskbd, 0, 1, 2, 3)dnl
+target(wscons, wsmouse, 0, 1, 2, 3)dnl
 _mkdev({-wscons-}, {-wscons-}, {-dnl
-_dl(dnl
-{-wscons-}, {-ttyCcfg-},
-{-wsdisp-}, {-ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9-},
-{-wsdisp-}, {-ttyCa ttyCb-},
-{-wsmux-}, {-wsmux-},
-{-wskbd-}, {-wskbd0 wskbd1 wskbd2 wskbd3-},
-{-wsmouse-}, {-wsmouse0 wsmouse1 wsmouse2 wsmouse3-})-})dnl
-__devitem(wsdisp, ttyC*, wscons virtual consoles)dnl
-_mkdev({-wsdisp-}, ttyC*, {-U=${i##ttyC}
+show_target(wscons)dnl
+-})dnl
+__devitem(wsdisp, tty[C-F]*, wscons virtual consoles)dnl
+_mkdev({-wsdisp-}, tty[C-F]*, {-U=${i##tty[C-F]}
+	case $i in
+	ttyC*) n=C m=expr(0*256);;
+	ttyD*) n=D m=expr(1*256);;
+	ttyE*) n=E m=expr(2*256);;
+	ttyF*) n=F m=expr(3*256);;
+	esac
 	case $U in
-	[0-9a-f]) M ttyC$U c major_wsdisp_c {-$(( 16#$U ))-} 600;;
-	cfg) M ttyCcfg c major_wsdisp_c 255 600;;
+	[0-9a-f]) M tty$n$U c major_wsdisp_c {-$(( 16#$U + $m ))-} 600;;
+	cfg) M tty${n}cfg c major_wsdisp_c Add(255,$m) 600;;
 	*) echo bad unit $U for $i; exit 1;;
 	esac-})dnl
 __devitem(wskbd, wskbd*, wscons keyboards)dnl