diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index add73391..0767290a 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.44 2002/02/21 18:34:11 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.45 2002/04/04 19:57:48 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.30 2000/01/21 12:28:29 tsutsui Exp $
 #
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
@@ -54,7 +54,6 @@
 #	ad*	unibus interface to data translation a/d converter
 #	np*	unibus ethernet co-processor interface, for downloading.
 #	qv*	qvss (microvax) display
-#	ttyv0	qvss (microvax) display reserved pty
 #	lkm	loadable kernel modules
 #	bpf*	berkeley packet filter
 #	tun*	network tunnel device
@@ -77,6 +76,8 @@ all)
 	sh $0 mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
 	sh $0 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 sd0 sd1 sd2 sd3 hd0 hd1 hd2
 	sh $0 dz0 dl0 dhu0 rx0 rx1 raid0 raid1 raid2 raid3
+	sh $0 ttyg0 ttyg1 ttyg2 ttyg3
+	sh $0 crl std-extra
 	;;
 
 floppy)
@@ -86,26 +87,16 @@ floppy)
 
 ramdisk)
 	sh $0 std random
-	sh $0 rd0 sd0 sd1 sd2 sd3 ra0 ra1 ra2 rx0 cd0 st0 st1
-	sh $0 bpf0
+	sh $0 rd0 sd0 sd1 sd2 ra0 ra1 ra2 rx0 cd0 st0
+	sh $0 bpf0 ttyg0
 	;;
 
 std)
-	rm -f console drum floppy crl csa1 csa2 tu0 tu1
-	rm -f kUmem kmem mem null zero tty klog ttyg[0-3]
+	rm -f console drum
+	rm -f kUmem kmem mem null zero tty klog
 	rm -f stdin stdout stderr ksyms
 	mknod console		c 0 0
-	mknod ttyg0		c 25 0
-	mknod ttyg1		c 25 1
-	mknod ttyg2		c 25 2
-	mknod ttyg3		c 25 3
 	mknod drum		c 7 0	; chmod 640 drum ; chgrp kmem drum
-	mknod floppy		c 8 0
-	mknod crl		c 35 0
-	mknod csa1		c 51 0
-	mknod csa2		c 51 1
-	mknod tu0		b 8 0
-	mknod tu1		b 8 1
 	mknod kUmem		c 3 3	; chmod 600 kUmem
 	mknod kmem		c 3 1	; chmod 640 kmem ; chgrp kmem kmem
 	mknod mem		c 3 0	; chmod 640 mem ; chgrp kmem mem
@@ -119,6 +110,20 @@ std)
 	mknod ksyms		c 50 0	; chmod 640 ksyms ; chown root.kmem ksyms
 	;;
 
+std-extra)
+	rm -f floppy csa1 csa2 tu0 tu1
+	mknod floppy		c 8 0
+	mknod csa1		c 51 0
+	mknod csa2		c 51 1
+	mknod tu0		b 8 0
+	mknod tu1		b 8 1
+	;;
+
+crl)
+	rm -f crl
+	mknod crl		c 35 0
+	;;
+
 fd)
 	rm -f fd/*
 	mkdir fd > /dev/null 2>&1
@@ -394,6 +399,19 @@ uu*)
 	esac
 	;;
 
+ttyg*)
+	unit=${i#ttyg};
+	case $unit in
+	[0-3])
+		rm -f ttyg${unit}
+		mknod ttyg$unit	c 25 $unit
+		;;
+	*)
+		echo bad unit for ttyg: $i
+		;;
+	esac
+	;;
+
 dz*)
 	unit=${i#dz};
 	case $unit in
@@ -627,12 +645,6 @@ qv0)
 	mknod mouse c 40 2
 	;;
 
-ttyv0)
-	if [ ! -f ttyqe ]; then sh ./$0 pty1; fi
-	mv ttyqf ttyv0
-	mv ptyqf ptyv0
-	;;
-
 altq)
 	mkdir -p altq
 	chmod 755 altq