diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 4e9b4efc..5e1ac085 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.32 2007/05/27 01:50:35 todd Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.33 2007/05/28 22:26:01 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -69,6 +69,7 @@
 #	usb*	Bus control devices used by usbd for attach/detach
 # Special purpose devices:
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
@@ -341,6 +342,10 @@ bktr*)
 	M bktr$U c 58 $U 644
 	;;
 
+bio)
+	M bio c 53 0 600
+	;;
+
 audio*)
 	M sound$U	c 24 $U
 	M mixer$U	c 24 $(($U+16))
@@ -530,13 +535,13 @@ all)
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
 	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0
-	R ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0
-	R iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
-	R rmidi7 tuner0 radio0 music0 speaker audio0 uk0 random lpa0
-	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0
-	R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2
-	R ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 raid0
-	R raid1 raid2 raid3 std st0 st1 fd
+	R ss1 ch0 bio hotplug ptm local wscons pci0 pci1 pci2 pci3
+	R iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
+	R rmidi6 rmidi7 tuner0 radio0 music0 speaker audio0 uk0 random
+	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
+	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1
+	R ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3
+	R raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV
index 1819d673..815871d4 100644
--- a/src/etc/etc.armish/MAKEDEV
+++ b/src/etc/etc.armish/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armish/MAKEDEV.md,v 1.4 2007/05/27 01:50:35 todd Exp 
+#	OpenBSD: etc.armish/MAKEDEV.md,v 1.5 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -65,6 +65,7 @@
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	hotplug	devices hot plugging
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
@@ -308,6 +309,10 @@ hotplug)
 	M hotplug c 37 $U 400
 	;;
 
+bio)
+	M bio c 52 0 600
+	;;
+
 audio*)
 	M sound$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
@@ -469,7 +474,7 @@ local)
 
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
+	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 hotplug ptm
 	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall tuner0
 	R radio0 audio0 uk0 random lkm tty00 tty01 tty02 tty03 apm
diff --git a/src/etc/etc.cats/MAKEDEV b/src/etc/etc.cats/MAKEDEV
index 9c710a82..299d5404 100644
--- a/src/etc/etc.cats/MAKEDEV
+++ b/src/etc/etc.cats/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.cats/MAKEDEV.md,v 1.17 2007/05/27 01:50:35 todd Exp 
+#	OpenBSD: etc.cats/MAKEDEV.md,v 1.18 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -64,6 +64,7 @@
 #	uscanner*	Scanners
 # Special purpose devices:
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
@@ -303,6 +304,10 @@ bktr*)
 	M bktr$U c 75 $U 644
 	;;
 
+bio)
+	M bio c 52 0 600
+	;;
+
 audio*)
 	M sound$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
@@ -464,7 +469,7 @@ ramdisk)
 
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
+	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 ptm local
 	R wscons pci0 pci1 pci2 pci3 iop0 iop1 uall tuner0 radio0
 	R speaker audio0 uk0 random lkm tty00 tty01 tty02 tty03 crypto
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 4afa89cf..3d8afbbc 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.29 2007/05/27 01:50:35 todd Exp 
+#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.30 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -60,6 +60,7 @@
 # Printers:
 #	ppi*	HP-IB plotters
 # Special purpose devices:
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
@@ -329,6 +330,10 @@ bpf*)
 	M bpf$U c 22 $U 600
 	;;
 
+bio)
+	M bio c 49 0 600
+	;;
+
 wsmouse*)
 	M wsmouse$U c 42 $U 600
 	;;
@@ -450,9 +455,9 @@ local)
 all)
 	R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 ccd0 ccd1
 	R ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1
-	R rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0 ptm local ppi0 apci0 wscons
-	R uk0 random lkm pf systrace std st0 st1 fd
+	R rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5
+	R bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0 ptm local ppi0 apci0
+	R wscons uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|hd*|ccd*)
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 1a5a6d29..7c6f8c96 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.29 2007/05/27 01:50:35 todd Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.30 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -66,6 +66,7 @@
 #	ttyU*	USB serial ports
 #	uscanner*	Scanners
 # Special purpose devices:
+#	bio	ioctl tunnel pseudo-device
 #	audio*	Audio devices
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
@@ -302,6 +303,10 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+bio)
+	M bio c 37 0 600
+	;;
+
 uscanner*)
 	M uscanner$U c 46 $U 660
 	;;
@@ -488,10 +493,10 @@ all)
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
 	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0
-	R ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
-	R audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
-	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
-	R st1 fd
+	R ss1 bio ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3
+	R uall audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
+	R tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3
+	R std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index 56d81471..67880762 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/etc/etc.hppa64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.6 2007/05/27 01:50:35 todd Exp 
+#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.7 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -58,6 +58,7 @@
 #	lpt*	IEEE 1284 centronics printer
 # Special purpose devices:
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
 #	fd	fd/* nodes
@@ -277,6 +278,10 @@ bpf*)
 	M bpf$U c 17 $U 600
 	;;
 
+bio)
+	M bio c 37 0 600
+	;;
+
 audio*)
 	M sound$U	c 35 $U
 	M mixer$U	c 35 $(($U+16))
@@ -430,7 +435,7 @@ local)
 
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
+	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
 	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0
 	R ss1 ch0 ptm local wscons pci0 pci1 pci2 pci3 audio0 uk0
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index ba79a35f..e463286e 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.6 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.7 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -64,6 +64,7 @@
 #	uscanner*	Scanners
 # Special purpose devices:
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	hotplug	devices hot plugging
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
@@ -292,6 +293,10 @@ hotplug)
 	M hotplug c 37 $U 400
 	;;
 
+bio)
+	M bio c 37 0 600
+	;;
+
 audio*)
 	M sound$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
@@ -445,7 +450,7 @@ local)
 
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
+	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 ttya hotplug
 	R ptm local wscons pci0 pci1 pci2 pci3 uall radio0 audio0 uk0
 	R random lkm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index 9a1e56a0..0c5ed875 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.6 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.7 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -53,6 +53,7 @@
 # Pointing devices:
 #	wsmouse*	wscons mice
 # Special purpose devices:
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	fd	fd/* nodes
 #	lcd	front panel LCD display
@@ -260,6 +261,10 @@ bpf*)
 	M bpf$U c 22 $U 600
 	;;
 
+bio)
+	M bio c 49 0 600
+	;;
+
 wsmouse*)
 	M wsmouse$U c 15 $U 600
 	;;
@@ -366,9 +371,9 @@ ramdisk)
 
 all)
 	R lcd ttya ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
-	R sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2
-	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0 ptm
-	R local wscons uk0 random lkm pf systrace std st0 st1 fd
+	R sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
+	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0
+	R ptm local wscons uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 8f8ce546..a16aa617 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.24 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.25 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -54,6 +54,7 @@
 #	wsmouse*	wscons mice
 # Special purpose devices:
 #	asc*	ASC Audio device
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
@@ -281,6 +282,10 @@ bpf*)
 	M bpf$U c 22 $U 600
 	;;
 
+bio)
+	M bio c 49 0 600
+	;;
+
 asc*)
 	M asc$U 36 0
 	;;
@@ -388,9 +393,9 @@ ramdisk)
 all)
 	R ccd0 ccd1 ccd2 ccd3 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0
-	R ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 ptm local
-	R wscons asc0 uk0 random lkm tty00 tty01 pf systrace std st0
-	R st1 fd
+	R ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 bio ptm
+	R local wscons asc0 uk0 random lkm tty00 tty01 pf systrace std
+	R st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index bd218e6e..7e7dbf26 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.18 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.19 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -51,6 +51,7 @@
 # Printers:
 #	par0	On-board printer port
 # Special purpose devices:
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	fd	fd/* nodes
 #	flash*	NAND flash pseudo-disk devices
@@ -279,6 +280,10 @@ bpf*)
 	M bpf$U c 22 $U 600
 	;;
 
+bio)
+	M bio c 27 0 600
+	;;
+
 lp*)
 	u=${i#lp*}
 	case $u in
@@ -406,9 +411,9 @@ all)
 	R ttyw0 ttyw1 ttyw2 ttyw3 tty00 tty01 tty02 tty03 cuaa cuab
 	R cuac cuad ttya ttyb ttyc ttyd ccd0 ccd1 ccd2 ccd3 vnd0 vnd1
 	R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2
-	R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
-	R xfs0 ss0 ss1 ch0 vmel0 vmes0 flash0 nvram0 sram0 ptm local
-	R uk0 random lkm pf systrace std st0 st1 fd
+	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
+	R pty0 xfs0 ss0 ss1 ch0 vmel0 vmes0 flash0 nvram0 sram0 ptm
+	R local uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index f7da9f89..e95ca88d 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/etc/etc.mvme88k/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.18 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.19 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -48,6 +48,7 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Special purpose devices:
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
@@ -270,6 +271,10 @@ bpf*)
 	M bpf$U c 22 $U 600
 	;;
 
+bio)
+	M bio c 49 0 600
+	;;
+
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
@@ -373,9 +378,9 @@ all)
 	R ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5 ttyv6 ttyv7 tty00 tty01
 	R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0
-	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R bpf8 bpf9 pty0 xfs0 ss0 ch0 vmel0 vmes0 nvram0 sram0 ptm
-	R local uk0 random lkm pf systrace std st0 st1 fd
+	R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
+	R bpf7 bpf8 bpf9 pty0 xfs0 ss0 ch0 vmel0 vmes0 nvram0 sram0
+	R ptm local uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index f17a8420..b192e720 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.14 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.15 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -55,6 +55,7 @@
 #	wsmouse*	wscons mice
 # Special purpose devices:
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
 #	fd	fd/* nodes
@@ -262,6 +263,10 @@ bpf*)
 	M bpf$U c 12 $U 600
 	;;
 
+bio)
+	M bio c 14 0 600
+	;;
+
 audio*)
 	M sound$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
@@ -382,7 +387,7 @@ ramdisk)
 
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
-	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
+	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0 ss0 ss1 ch0 ptm
 	R local wscons pci0 pci1 pci2 pci3 audio0 uk0 random tty00
 	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 8dde44a7..d3ff8535 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.33 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.34 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -68,6 +68,7 @@
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
@@ -281,6 +282,10 @@ bpf*)
 	M bpf$U c 105 $U 600
 	;;
 
+bio)
+	M bio c 124 0 600
+	;;
+
 audio*)
 	M sound$U	c 69 $U
 	M mixer$U	c 69 $(($U+16))
@@ -511,7 +516,7 @@ all)
 	R sd1 sd2 sd3 sd4 cd0 cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2
 	R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
-	R fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 cuaa cuab cuac cuad
+	R fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 bio cuaa cuab cuac cuad
 	R ttya ttyb ttyc ttyd ptm local wscons audio0 uk0 random lkm
 	R tty00 tty01 tty02 tty03 apm pf systrace xd0 xd1 xd2 xd3
 	R raid0 raid1 raid2 raid3 std st0 st1 fd
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index df3e5d7f..89d32ced 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.43 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.44 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -77,6 +77,7 @@
 #	uscanner*	Scanners
 # Special purpose devices:
 #	audio*	Audio devices
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
 #	fd	fd/* nodes
@@ -330,6 +331,10 @@ bpf*)
 	M bpf$U c 105 $U 600
 	;;
 
+bio)
+	M bio c 120 0 600
+	;;
+
 audio*)
 	M sound$U	c 69 $U
 	M mixer$U	c 69 $(($U+16))
@@ -584,7 +589,7 @@ local)
 
 all)
 	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd bpp0 vnd0 vnd1 vnd2
-	R vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3
+	R vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1
 	R fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E
 	R fd0F fd0G fd0H xfs0 ss0 ss1 ch0 ccd0 ccd1 ccd2 ccd3 hotplug
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 5d2fd18a..5e701ef4 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.vax/MAKEDEV.md,v 1.30 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.vax/MAKEDEV.md,v 1.31 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -70,6 +70,7 @@
 # Pointing devices:
 #	wsmouse*	wscons mice
 # Special purpose devices:
+#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
@@ -325,6 +326,10 @@ bpf*)
 	M bpf$U c 56 $U 600
 	;;
 
+bio)
+	M bio c 72 0 600
+	;;
+
 wsmouse*)
 	M wsmouse$U c 70 $U 600
 	;;
@@ -511,7 +516,7 @@ local)
 
 all)
 	R dl0 dz0 dhu0 ts0 ts1 mt0 mt1 hd0 hd1 hd2 ccd0 vnd0 sd0 sd1
-	R sd2 sd3 cd0 tun0 tun1 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
+	R sd2 sd3 cd0 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
 	R bpf7 pty0 ss0 ptm local wscons uk0 random lkm pf systrace
 	R rx0 rx1 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 raid0 raid1 raid2
 	R raid3 std st0 st1 fd
diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index a18dc9d0..1567cbeb 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/etc/etc.zaurus/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.11 2007/05/27 01:50:36 todd Exp 
+#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.12 2007/05/28 22:26:02 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.34 2007/05/18 14:05:33 jmc Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -66,6 +66,7 @@
 #	apm	Power management device
 #	audio*	Audio devices
 #	hotplug	devices hot plugging
+#	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
@@ -293,6 +294,10 @@ bktr*)
 	M bktr$U c 75 $U 644
 	;;
 
+bio)
+	M bio c 52 0 600
+	;;
+
 hotplug)
 	M hotplug c 37 $U 400
 	;;
@@ -459,10 +464,10 @@ local)
 all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 hotplug ptm
-	R local wscons uall tuner0 radio0 audio0 uk0 random lkm tty00
-	R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3
-	R raid0 raid1 raid2 raid3 std st0 st1 fd
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio xfs0 ss0 ss1 ch0 hotplug
+	R ptm local wscons uall tuner0 radio0 audio0 uk0 random lkm
+	R tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2
+	R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)