diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 51910ba3..bd8efe5f 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: MAKEDEV,v 1.27 1997/09/07 20:01:15 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.28 1997/09/16 06:00:49 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -100,7 +100,8 @@ all)
 	sh MAKEDEV std fd sd0 sd1 sd2 sd3 sd4 pty0 pty1
 	sh MAKEDEV st0 st1 ch0 cd0 cd1 vnd0 vnd1 vnd2 vnd3
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3 wd0 wd1 wd2 wd3 acd0 acd1
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2 tun3
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	sh MAKEDEV tun0 tun1 tun2 tun3
 	sh MAKEDEV ttyB0 ttyB1 ttyC0 ttyC1 ttyE0 ttyE1 lkm
 	sh MAKEDEV mmclock kbd mouse lpa0 lpt0 random ipl
 	sh MAKEDEV uk0 uk1 ss0 ss1
diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index 047c4fe9..e38354bf 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.26 1997/09/07 20:29:08 dgregor Exp $
+#	$OpenBSD: MAKEDEV,v 1.27 1997/09/16 06:00:51 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -118,7 +118,7 @@ all)
 	sh MAKEDEV grf0 grf1 grf2 grf3 grf4 grf5
 	sh MAKEDEV kbd sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
 	sh MAKEDEV vnd0 vnd1 vnd2 vnd3 vnd4 vnd5 vnd6 cd0 cd1 fd0 fd1 fd2 fd3
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh MAKEDEV view00 view01 view02 view03 view04 view05 pty0 pty1
 	sh MAKEDEV lpa0 lpa1 lpt0 lpt1 lpt2 ipl
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3 wd0 wd1 acd0 ch0 uk0 uk1
diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
index 28a5e76b..c7f61845 100644
--- a/src/etc/etc.arc/MAKEDEV
+++ b/src/etc/etc.arc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.20 1997/09/07 20:29:09 dgregor Exp $
+#	$OpenBSD: MAKEDEV,v 1.21 1997/09/16 06:00:52 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -73,7 +73,8 @@ all)
 	sh MAKEDEV std fd fd0 wd0 wd1 wd2 wd3 sd0 sd1 sd2 st0 acd0 cd0 ss0
 	sh MAKEDEV ccd0 ccd1 ccd2
 	sh MAKEDEV vnd0 vnd1 vnd2 vnd3 tty00 tty01 tty02 tty03 pty0 pty1
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 ipl tun0 tun1 tun2
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	sh MAKEDEV ipl tun0 tun1 tun2
 	sh MAKEDEV ttyC0 lpt0 pms0 random uk0 uk1 local
 	;;
 
diff --git a/src/etc/etc.arm32/MAKEDEV b/src/etc/etc.arm32/MAKEDEV
index 32fb262b..6e17e347 100644
--- a/src/etc/etc.arm32/MAKEDEV
+++ b/src/etc/etc.arm32/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.9 1997/05/14 15:41:09 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.10 1997/09/16 06:00:54 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.3 1996/04/26 20:10:24 mark Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -92,7 +92,8 @@ all)
 	sh MAKEDEV std fd fd0 fd1 wd0 wd1 rd0 rd1 sd0 sd1 sd2 tty0 tty1 pty0 pty1
 	sh MAKEDEV st0 st1 ch0 cd0 cd1 vnd0 vnd1 ccd0 ccd1 uk0 uk1 ss0
 	sh MAKEDEV ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5 ttyv6 ttyv7 ttyv8 ttyv9
-	sh MAKEDEV lpa0 lpt0 bpf0 bpf1 bpf2 bpf3 tun0 tun1 tun2 random
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	sh MAKEDEV lpa0 lpt0 tun0 tun1 tun2 random
 	sh MAKEDEV beep lkm quadmouse local cpu0 cpu1 cpu2 cpu3 cpu4 cpu5
 	;;
 
diff --git a/src/etc/etc.atari/MAKEDEV b/src/etc/etc.atari/MAKEDEV
index f029ee64..708ea36b 100644
--- a/src/etc/etc.atari/MAKEDEV
+++ b/src/etc/etc.atari/MAKEDEV
@@ -93,8 +93,8 @@ all)
 	sh MAKEDEV grf2 grf3 grf4 grf5 mouse0 mouse1
 	sh MAKEDEV kbd sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 vnd0 vnd1 vnd2
 	sh MAKEDEV vnd3 vnd4 view00 view01 view02 view03 view04 view05 pty0 
-	sh MAKEDEV vnd5 vnd6 cd0 fd0 fd1 fd2 fd3 bpf0 bpf1 bpf2 bpf3
-	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
+	sh MAKEDEV vnd5 vnd6 cd0 fd0 fd1 fd2 fd3 ccd0 ccd1 ccd2 ccd3
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh MAKEDEV tun0 tun1 lkm ser02 mdm02 lpt0 random uk0 uk1 ss0 local
 	;;
 
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 86a7ca3d..3c3e5f0e 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.22 1997/09/07 20:29:10 dgregor Exp $
+#	$OpenBSD: MAKEDEV,v 1.23 1997/09/16 06:00:57 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -100,7 +100,8 @@ all)
 	sh MAKEDEV std fd ct0 ct1 st0 st1 ccd0 ccd1 ccd2 hd0 hd1 hd2
 	sh MAKEDEV sd0 sd1 sd2 rd0 rd1 pty0 vnd0 vnd1 vnd2 vnd3
 	sh MAKEDEV hil grf0 apci0 ppi0 ite0 dca0 dcm0 dcm1 dcm2 dcm3
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 ipl tun0 tun1 tun2 tun3 lkm random
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	sh MAKEDEV ipl tun0 tun1 tun2 tun3 lkm random
 	sh MAKEDEV local
 	;;
 
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 5b7bf883..9e12d542 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.49 1997/09/07 20:29:11 dgregor Exp $
+#	$OpenBSD: MAKEDEV,v 1.50 1997/09/16 06:00:58 deraadt Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -109,8 +109,8 @@ all)
 	sh MAKEDEV tty00 tty01 tty02 tty03 pty0 pty1 st0 st1 ch0 cd0 cd1
 	sh MAKEDEV ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
 	sh MAKEDEV mcd0 acd0 vnd0 vnd1 lpa0 lpa1 ccd0 ccd1 ccd2 ccd3
-	sh MAKEDEV lpt0 lpt1 lpt2 ttyC0 ttyC1 ttyC2 bpf0 bpf1 bpf2 bpf3
-	sh MAKEDEV ipl tun0 tun1 tun2
+	sh MAKEDEV lpt0 lpt1 lpt2 ttyC0 ttyC1 ttyC2 ipl tun0 tun1 tun2
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh MAKEDEV speaker lkm mms0 lms0 pms0 audio joy0 joy1 apm pcmcia local
 	sh MAKEDEV random uk0 uk1 ss0 ss1 pctr
 	sh MAKEDEV fd0 fdB0 fdC0 fdD0 fdE0 fdF0 fdG0 fdH0 
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 37a8a9ef..23773a03 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.19 1997/09/16 03:02:59 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.20 1997/09/16 06:01:00 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -93,8 +93,8 @@ all)
 	sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV adb asc0 grf0 grf1 grf2 grf3 ttye0
 	sh MAKEDEV tty00 tty01 pty0
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	sh MAKEDEV bpf8 bpf9 ipl
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	sh MAKEDEV ipl
 	sh MAKEDEV tun0 tun1 tun2 tun3
 	sh MAKEDEV lkm
 	sh MAKEDEV random
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index af8134e0..bb78e5bf 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.19 1997/05/14 15:41:15 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.20 1997/09/16 06:01:01 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: MAKEDEV,v 1.19 1997/05/14 15:41:15 niklas Exp $
+#	$Id: MAKEDEV,v 1.20 1997/09/16 06:01:01 deraadt Exp $
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, including local devices,
@@ -90,8 +90,8 @@ all)
 	sh MAKEDEV tty00 tty01 tty02 tty03
 	sh MAKEDEV ttyw0
 	sh MAKEDEV sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	sh MAKEDEV vnd0 vnd1 vnd2 vnd3 vnd4 pty0 
-	sh MAKEDEV vnd5 vnd6 cd0 bpf0 bpf1 bpf2 bpf3 ipl
+	sh MAKEDEV vnd0 vnd1 pty0 cd0 ipl
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	#sh MAKEDEV ccd0 ccd1 ccd2 ccd3
 	sh MAKEDEV tun0 tun1 lkm local
 	sh MAKEDEV sram0 nvram0 flash0 vmel0 vmes0
diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV
index aa77764e..2035d813 100644
--- a/src/etc/etc.powerpc/MAKEDEV
+++ b/src/etc/etc.powerpc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#       $OpenBSD: MAKEDEV,v 1.11 1997/09/07 20:29:14 dgregor Exp $
+#       $OpenBSD: MAKEDEV,v 1.12 1997/09/16 06:01:03 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -88,8 +88,7 @@ all)
 	sh MAKEDEV rd0
 	sh MAKEDEV grf0 grf1 grf2 grf3 ttye0
 	sh MAKEDEV tty00 tty01 pty0
-	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	sh MAKEDEV bpf8 bpf9
+	sh MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	sh MAKEDEV tun0 tun1 tun2 tun3
 	sh MAKEDEV lkm
 	sh MAKEDEV local
diff --git a/src/etc/etc.wgrisc/MAKEDEV b/src/etc/etc.wgrisc/MAKEDEV
index e0ee9fef..c7c026d6 100644
--- a/src/etc/etc.wgrisc/MAKEDEV
+++ b/src/etc/etc.wgrisc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.5 1997/09/16 03:03:04 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.6 1997/09/16 06:01:05 deraadt Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -43,10 +43,10 @@ do
 case $i in
 
 all)        
-        sh MAKEDEV std fd sd0 sd1 sd2 st0 cd0 tty00 tty01 pty0 pty1
-        sh MAKEDEV pms0 random bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	sh MAKEDEV bpf7 bpf8 bpf9 local
-        ;;
+	sh MAKEDEV std fd sd0 sd1 sd2 st0 cd0 tty00 tty01 pty0 pty1
+	sh MAKEEDV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	sh MAKEDEV pms0 random local
+	;;
 
 std)
 	mknod console		c 0 0
@@ -234,10 +234,10 @@ pty*)
 	0|1|2|3|4)
 		umask 0
 		eval `echo $offset $name | awk ' { b=$1; n=$2 } END {
-                        for (i = 0; i < 16; i++)
-                                printf("rm -f tty%s%x; mknod tty%s%x c 4 %d;" \
-                                    "rm -f pty%s%x; mknod pty%s%x c 5 %d; ", \
-                                    n, i, n, i, b+i, n, i, n, i, b+i); }'`
+	                for (i = 0; i < 16; i++)
+	                        printf("rm -f tty%s%x; mknod tty%s%x c 4 %d;" \
+	                            "rm -f pty%s%x; mknod pty%s%x c 5 %d; ", \
+	                            n, i, n, i, b+i, n, i, n, i, b+i); }'`
 		umask 77
 		;;
 	esac