regen

22 files changed, 174 insertions, 165 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 00f52e7c2b3..5b4e87fae7c 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.57 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -75,7 +75,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
@@ -319,7 +319,7 @@ hotplug)
 	M hotplug c 56 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 67 $U 600
 	;;
 
@@ -550,14 +550,14 @@ all)
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H diskmap vscsi0 ch0 bio audio0 audio1 audio2 fuse
-	R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1
-	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 speaker video0 video1 uk0 random lpa0 lpa1
-	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1
-	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3
-	R ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1
-	R fd
+	R fd0G fd0H diskmap vscsi0 ch0 bio audio0 audio1 audio2 fuse0
+	R fuse1 fuse2 fuse3 pppx hotplug ptm local wscons pci0 pci1
+	R pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
+	R rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0
+	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
+	R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0
+	R ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2
+	R wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index a908c12d8aa..b8abf56af15 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.amd64/MAKEDEV.md,v 1.50 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -77,7 +77,7 @@
 #	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	gpio*	General Purpose Input/Output
 #	gpr*	GPR400 smartcard reader
 #	hotplug	devices hot plugging
@@ -336,7 +336,7 @@ gpio*)
 	M gpio$U c 88 $U 600
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 92 $U 600
 	;;
 
@@ -582,13 +582,13 @@ all)
 	R sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3
 	R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D
 	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
-	R ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall
-	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 speaker video0 video1 uk0 random lpa0 lpa1
-	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1
-	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse0 fuse1 fuse2
+	R fuse3 pppx hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3
+	R iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
+	R rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0 random
+	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
+	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto
+	R pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index be964789c5b..b99b63d8f87 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armish/MAKEDEV.md,v 1.26 2013/03/15 09:10:52 ratchov Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.armish/MAKEDEV.md,v 1.27 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -69,7 +69,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
@@ -297,7 +297,7 @@ hotplug)
 	M hotplug c 37 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 77 $U 600
 	;;
 
@@ -494,11 +494,12 @@ all)
 	R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
-	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
-	R radio0 video0 video1 uk0 random lkm tty00 tty01 tty02 tty03
-	R apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse0 fuse1 fuse2
+	R fuse3 pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0
+	R iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+	R rmidi7 tuner0 radio0 video0 video1 uk0 random lkm tty00
+	R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std
+	R st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.aviion/MAKEDEV b/etc/etc.aviion/MAKEDEV
index ccef5567061..9815268ce73 100644
--- a/etc/etc.aviion/MAKEDEV
+++ b/etc/etc.aviion/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.15 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.16 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -48,7 +48,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	lkm	Loadable kernel modules interface
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
@@ -239,7 +239,7 @@ lkm)
 	M lkm c 24 0 640 _lkm
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 45 $U 600
 	;;
 
@@ -341,8 +341,9 @@ ramdisk)
 all)
 	R ttya ttyb ttyc vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0
 	R cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 nvram0 fuse
-	R pppx ptm local uk0 random lkm pf systrace std st0 st1 fd
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 nvram0
+	R fuse0 fuse1 fuse2 fuse3 pppx ptm local uk0 random lkm pf
+	R systrace std st0 st1 fd
 	;;
 
 sd*)
diff --git a/etc/etc.beagle/MAKEDEV b/etc/etc.beagle/MAKEDEV
index 628b21735f9..51e49266777 100644
--- a/etc/etc.beagle/MAKEDEV
+++ b/etc/etc.beagle/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.beagle/MAKEDEV.md,v 1.4 2013/03/15 09:10:52 ratchov Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.beagle/MAKEDEV.md,v 1.5 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -69,7 +69,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
@@ -297,7 +297,7 @@ hotplug)
 	M hotplug c 37 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 77 $U 600
 	;;
 
@@ -494,11 +494,11 @@ all)
 	R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
-	R diskmap vscsi0 ch0 fuse pppx hotplug ptm local wscons pci0
-	R pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3
-	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0
-	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R diskmap vscsi0 ch0 fuse0 fuse1 fuse2 fuse3 pppx hotplug ptm
+	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 video0 video1 uk0 random lkm tty00 tty01 tty02 tty03
+	R apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 76da691a727..b9cf67deec1 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.hp300/MAKEDEV.md,v 1.46 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -63,7 +63,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
@@ -322,7 +322,7 @@ hotplug)
 	M hotplug c 56 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 57 $U 600
 	;;
 
@@ -476,8 +476,9 @@ all)
 	R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 vnd0 vnd1
 	R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2
 	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
-	R pty0 diskmap vscsi0 ch0 audio0 fuse pppx hotplug ptm local
-	R ppi0 apci0 wscons uk0 random lkm pf systrace std st0 st1 fd
+	R pty0 diskmap vscsi0 ch0 audio0 fuse0 fuse1 fuse2 fuse3 pppx
+	R hotplug ptm local ppi0 apci0 wscons uk0 random lkm pf
+	R systrace std st0 st1 fd
 	;;
 
 sd*|hd*)
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index bb576ac7104..4643ac8f732 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.hppa/MAKEDEV.md,v 1.49 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -71,7 +71,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	pci*	PCI bus devices
@@ -280,7 +280,7 @@ hotplug)
 	M hotplug c 47 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 58 $U 600
 	;;
 
@@ -507,11 +507,11 @@ all)
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
-	R fd0G fd0H diskmap vscsi0 bio ch0 audio0 audio1 audio2 fuse
-	R pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
-	R video0 video1 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
+	R fd0G fd0H diskmap vscsi0 bio ch0 audio0 audio1 audio2 fuse0
+	R fuse1 fuse2 fuse3 pppx hotplug ptm local wscons pci0 pci1
+	R pci2 pci3 uall video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0
+	R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0
+	R wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index 3766c4b1d78..32e928e840d 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.26 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -70,7 +70,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	lkm	Loadable kernel modules interface
 #	pci*	PCI bus devices
 #	pdc	PDC device
@@ -274,7 +274,7 @@ lkm)
 	M lkm c 19 0 640 _lkm
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 58 $U 600
 	;;
 
@@ -497,10 +497,10 @@ all)
 	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 diskmap
-	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx ptm local wscons
-	R pci0 pci1 pci2 pci3 uall video0 video1 uk0 random lpa0 lpa1
-	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R vscsi0 ch0 audio0 audio1 audio2 fuse0 fuse1 fuse2 fuse3 pppx
+	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
+	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
+	R tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 194307d42a2..719d0a08d8e 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.65 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -78,7 +78,7 @@
 #	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	gpio*	General Purpose Input/Output
 #	gpr*	GPR400 smartcard reader
 #	hotplug	devices hot plugging
@@ -342,7 +342,7 @@ gpio*)
 	M gpio$U c 83 $U 600
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 93 $U 600
 	;;
 
@@ -592,13 +592,14 @@ all)
 	R sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C
 	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
-	R fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx
-	R hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1
-	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 speaker video0 video1 uk0 random joy0 joy1
-	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
-	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto
-	R pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 fuse0 fuse1
+	R fuse2 fuse3 pppx hotplug ptm gpr0 local wscons pci0 pci1
+	R pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
+	R rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0
+	R random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
+	R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+	R ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 std st0
+	R st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index f15d3580be8..be1907dc4d2 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.landisk/MAKEDEV.md,v 1.29 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -67,7 +67,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	pci*	PCI bus devices
@@ -285,7 +285,7 @@ hotplug)
 	M hotplug c 37 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 103 $U 600
 	;;
 
@@ -470,11 +470,11 @@ all)
 	R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
-	R diskmap vscsi0 ch0 ttya audio0 audio1 audio2 fuse pppx
-	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0
-	R video0 video1 uk0 random lkm crypto pf systrace wd0 wd1 wd2
-	R wd3 std st0 st1 fd
+	R diskmap vscsi0 ch0 ttya audio0 audio1 audio2 fuse0 fuse1
+	R fuse2 fuse3 pppx hotplug ptm local wscons pci0 pci1 pci2
+	R pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+	R rmidi7 radio0 video0 video1 uk0 random lkm crypto pf
+	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index 3a975780c63..f66571967bd 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.loongson/MAKEDEV.md,v 1.14 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -69,7 +69,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
@@ -266,7 +266,7 @@ hotplug)
 	M hotplug c 67 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 73 $U 600
 	;;
 
@@ -464,10 +464,10 @@ all)
 	R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1
-	R pty2 diskmap vscsi0 audio0 audio1 audio2 fuse pppx hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
-	R random tty00 tty01 tty02 tty03 apm crypto pf systrace wd0
-	R wd1 wd2 wd3 std st0 st1 fd
+	R pty2 diskmap vscsi0 audio0 audio1 audio2 fuse0 fuse1 fuse2
+	R fuse3 pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R video0 video1 uk0 random tty00 tty01 tty02 tty03 apm crypto
+	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index 7d1ebbc39e4..a6fc257b876 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.19 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.20 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -55,7 +55,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	lcd	front panel LCD display
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
@@ -246,7 +246,7 @@ lcd)
 		M lcd c 10 0 644 
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 45 $U 600
 	;;
 
@@ -375,8 +375,9 @@ ramdisk)
 all)
 	R lcd ttya vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1
 	R rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5
-	R bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 fuse pppx ptm
-	R local wscons uk0 random lkm pf systrace std st0 st1 fd
+	R bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 fuse0 fuse1
+	R fuse2 fuse3 pppx ptm local wscons uk0 random lkm pf systrace
+	R std st0 st1 fd
 	;;
 
 sd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 408658311e0..b20843b2007 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.53 2013/03/15 09:10:52 ratchov Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.54 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -74,7 +74,7 @@
 #	agp*	AGP bridge
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	gpio*	General Purpose Input/Output
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
@@ -305,7 +305,7 @@ gpio*)
 	M gpio$U c 79 $U 600
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 88 $U 600
 	;;
 
@@ -537,11 +537,11 @@ all)
 	R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1
 	R rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
 	R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 cuaa cuab ttya ttyb
-	R audio0 audio1 audio2 fuse pppx hotplug ptm local wscons pci0
-	R pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3
-	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0
-	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R audio0 audio1 audio2 fuse0 fuse1 fuse2 fuse3 pppx hotplug
+	R ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 video0 video1 uk0 random lkm tty00 tty01 tty02 tty03
+	R apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index c8abdb5343a..88f639d4b4d 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.33 2013/06/03 17:34:15 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -54,7 +54,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	flash0	On-board flash memory
 #	lkm	Loadable kernel modules interface
 #	nvram0	On-board non-volatile memory
@@ -265,7 +265,7 @@ flash0)
 	M flash0 c 11 0 640 kmem
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 57 $U 600
 	;;
 
@@ -426,8 +426,9 @@ all)
 	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd vnd0 vnd1 vnd2 vnd3
 	R sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
-	R vscsi0 ch0 vmel0 vmes0 flash0 nvram0 sram0 fuse pppx ptm
-	R local uk0 random lkm pf systrace std st0 st1 fd
+	R vscsi0 ch0 vmel0 vmes0 flash0 nvram0 sram0 fuse0 fuse1 fuse2
+	R fuse3 pppx ptm local uk0 random lkm pf systrace std st0 st1
+	R fd
 	;;
 
 sd*)
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index 525905603f9..7fe15d366bb 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.31 2012/08/23 06:15:28 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.32 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -50,7 +50,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	lkm	Loadable kernel modules interface
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
@@ -256,7 +256,7 @@ lkm)
 	M lkm c 24 0 640 _lkm
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 45 $U 600
 	;;
 
@@ -381,8 +381,9 @@ all)
 	R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb vnd0 vnd1 vnd2
 	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
-	R diskmap vscsi0 ch0 vmel0 vmes0 nvram0 sram0 fuse pppx ptm
-	R local uk0 random lkm pf systrace std st0 st1 fd
+	R diskmap vscsi0 ch0 vmel0 vmes0 nvram0 sram0 fuse0 fuse1
+	R fuse2 fuse3 pppx ptm local uk0 random lkm pf systrace std
+	R st0 st1 fd
 	;;
 
 sd*)
diff --git a/etc/etc.octeon/MAKEDEV b/etc/etc.octeon/MAKEDEV
index ec49a4ff81a..e48d1bc1cf4 100644
--- a/etc/etc.octeon/MAKEDEV
+++ b/etc/etc.octeon/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.octeon/MAKEDEV.md,v 1.1 2013/03/26 17:58:11 jasper Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.octeon/MAKEDEV.md,v 1.2 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -61,7 +61,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
@@ -258,7 +258,7 @@ hotplug)
 	M hotplug c 67 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 53 $U 600
 	;;
 
@@ -412,10 +412,10 @@ all)
 	R octcf0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7
 	R sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2
 	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 diskmap
-	R vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug ptm local
-	R wscons pci0 pci1 pci2 pci3 video0 video1 uk0 random tty00
-	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
-	R st1 fd
+	R vscsi0 ch0 audio0 audio1 audio2 fuse0 fuse1 fuse2 fuse3 pppx
+	R hotplug ptm local wscons pci0 pci1 pci2 pci3 video0 video1
+	R uk0 random tty00 tty01 tty02 tty03 crypto pf systrace wd0
+	R wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 octcf*|wd*|sd*)
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 7a09591387d..ba1f0cea393 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sgi/MAKEDEV.md,v 1.38 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -68,7 +68,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
@@ -265,7 +265,7 @@ hotplug)
 	M hotplug c 67 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 73 $U 600
 	;;
 
@@ -469,10 +469,10 @@ all)
 	R ttya ttyb vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6
 	R sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
-	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse pppx hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
-	R random tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1
-	R wd2 wd3 std st0 st1 fd
+	R diskmap vscsi0 ch0 audio0 audio1 audio2 fuse0 fuse1 fuse2
+	R fuse3 pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R video0 video1 uk0 random tty00 tty01 tty02 tty03 crypto pf
+	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV
index 388e278d40f..2cb75529361 100644
--- a/etc/etc.socppc/MAKEDEV
+++ b/etc/etc.socppc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.socppc/MAKEDEV.md,v 1.19 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -65,7 +65,7 @@
 #	bthub*	Bluetooth Hubs
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	pci*	PCI bus devices
@@ -263,7 +263,7 @@ hotplug)
 	M hotplug c 84 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 85 $U 600
 	;;
 
@@ -437,9 +437,10 @@ all)
 	R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
-	R vscsi0 ch0 fuse pppx hotplug ptm local wscons pci0 pci1 pci2
-	R pci3 uall video0 video1 random lkm tty00 tty01 tty02 tty03
-	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R vscsi0 ch0 fuse0 fuse1 fuse2 fuse3 pppx hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 uall video0 video1 random lkm
+	R tty00 tty01 tty02 tty03 pf systrace wd0 wd1 wd2 wd3 std st0
+	R st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index a95ee05057b..44e9fe277c3 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc/MAKEDEV.md,v 1.51 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -69,7 +69,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	openprom	PROM settings
@@ -271,7 +271,7 @@ hotplug)
 	M hotplug c 131 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 82 $U 600
 	;;
 
@@ -523,9 +523,9 @@ all)
 	R bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D
 	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
 	R diskmap vscsi0 ch0 bio cuaa cuab cuac cuad ttya ttyb ttyc
-	R ttyd audio0 audio1 audio2 fuse pppx hotplug ptm local wscons
-	R uk0 random lkm tty00 tty01 tty02 tty03 apm pf systrace xd0
-	R xd1 xd2 xd3 std st0 st1 fd
+	R ttyd audio0 audio1 audio2 fuse0 fuse1 fuse2 fuse3 pppx
+	R hotplug ptm local wscons uk0 random lkm tty00 tty01 tty02
+	R tty03 apm pf systrace xd0 xd1 xd2 xd3 std st0 st1 fd
 	;;
 
 presto*|xd*|xy*|sd*)
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 5ad013103be..6229069dcc9 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.73 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -82,7 +82,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	openprom	PROM settings
@@ -326,7 +326,7 @@ hotplug)
 	M hotplug c 124 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 134 $U 600
 	;;
 
@@ -643,11 +643,11 @@ all)
 	R tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8
 	R bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B
 	R fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0
-	R audio1 audio2 fuse pppx hotplug ptm local wscons pci0 pci1
-	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0
-	R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R audio1 audio2 fuse0 fuse1 fuse2 fuse3 pppx hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
+	R rmidi4 rmidi5 rmidi6 rmidi7 video0 video1 uk0 random lpa0
+	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0
+	R ttyh1 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index ec686e59174..bd2c3b286b2 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.vax/MAKEDEV.md,v 1.50 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -62,7 +62,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -284,7 +284,7 @@ lkm)
 	M lkm c 28 0 640 _lkm
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 82 $U 600
 	;;
 
@@ -473,9 +473,9 @@ local)
 all)
 	R qsc0 dl0 dz0 dhu0 mt0 mt1 hd0 hd1 hd2 vnd0 sd0 sd1 sd2 sd3
 	R cd0 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R pty0 diskmap vscsi0 ch0 audio0 fuse pppx ptm local wscons
-	R uk0 random lkm pf systrace rx0 rx1 ra0 ra1 ra2 ra3 std st0
-	R st1 fd
+	R pty0 diskmap vscsi0 ch0 audio0 fuse0 fuse1 fuse2 fuse3 pppx
+	R ptm local wscons uk0 random lkm pf systrace rx0 rx1 ra0 ra1
+	R ra2 ra3 std st0 st1 fd
 	;;
 
 sd*|rx*|ra*|hd*)
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index a9cdf2c4a26..a05a5d8c8e5 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.32 2013/03/15 09:10:52 ratchov Exp 
-#	OpenBSD: MAKEDEV.common,v 1.64 2013/06/03 16:06:42 tedu Exp 
+#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.33 2013/06/03 17:34:15 tedu Exp 
+#	OpenBSD: MAKEDEV.common,v 1.65 2013/06/15 23:09:36 halex Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -69,7 +69,7 @@
 #	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	fuse	Userland Filesystem
+#	fuse*	Userland Filesystem
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
@@ -286,7 +286,7 @@ hotplug)
 	M hotplug c 37 $U 400
 	;;
 
-fuse)
+fuse*)
 	M fuse$U c 77 $U 600
 	;;
 
@@ -483,10 +483,11 @@ all)
 	R bthub0 bthub1 bthub2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
 	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio
-	R diskmap vscsi0 ch0 fuse pppx hotplug ptm local wscons uall
-	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 video0 video1 uk0 random lkm tty00 tty01 tty02
-	R tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R diskmap vscsi0 ch0 fuse0 fuse1 fuse2 fuse3 pppx hotplug ptm
+	R local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
+	R rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random lkm
+	R tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2
+	R wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)