diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 3ac4b2e8..95183eaa 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.54 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.55 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -79,7 +79,6 @@
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -308,10 +307,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 music*)
 	M music$U     c 42 $U
 	M sequencer$U c 42 $(($U+128))
@@ -558,7 +553,7 @@ 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 nnpfs0 ch0 bio audio0 audio1 audio2
+	R fd0G fd0H diskmap vscsi0 ch0 bio audio0 audio1 audio2
 	R hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall
 	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
 	R tuner0 radio0 music0 speaker video0 video1 uk0 random lpa0
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index 28f200de..0ba56819 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.47 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.48 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -83,7 +83,6 @@
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
-#	nnpfs*	NNPFS filesystem node
 #	nvram	NVRAM access
 #	pci*	PCI bus devices
 #	pctr*	PC Performance Tuning Register access device
@@ -317,10 +316,6 @@ nvram)
 	M nvram c 85 0 440 kmem
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 music*)
 	M music$U     c 53 $U
 	M sequencer$U c 53 $(($U+128))
@@ -590,8 +585,8 @@ 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 nnpfs0 ch0 audio0 audio1 audio2 hotplug ptm
-	R gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+	R diskmap vscsi0 ch0 audio0 audio1 audio2 hotplug ptm gpr0
+	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
 	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
 	R radio0 music0 speaker video0 video1 uk0 random lpa0 lpa1
 	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1
diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV
index 34eb9ced..1b6b048b 100644
--- a/src/etc/etc.armish/MAKEDEV
+++ b/src/etc/etc.armish/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armish/MAKEDEV.md,v 1.24 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.armish/MAKEDEV.md,v 1.25 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -73,7 +73,6 @@
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -286,10 +285,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -502,11 +497,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 nnpfs0 ch0 audio0 audio1 audio2 hotplug ptm
-	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
-	R radio0 music0 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 audio0 audio1 audio2 hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1
+	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
+	R music0 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/src/etc/etc.aviion/MAKEDEV b/src/etc/etc.aviion/MAKEDEV
index 6bf74f06..4c3c0f35 100644
--- a/src/etc/etc.aviion/MAKEDEV
+++ b/src/etc/etc.aviion/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.14 2011/10/06 20:49:27 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.15 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -49,7 +49,6 @@
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -235,10 +234,6 @@ nvram0)
 	M nvram0 c 10 0 640 kmem
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -341,8 +336,8 @@ 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 nnpfs0 ch0
-	R nvram0 ptm local uk0 random lkm pf systrace std st0 st1 fd
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 nvram0 ptm
+	R local uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*)
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index dfd768d7..d8ab4e68 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.44 2011/12/21 23:12:24 miod Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.45 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -65,7 +65,6 @@
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
 #	*random	In-kernel random data source
@@ -314,10 +313,6 @@ pf*)
 	M pf c 33 0 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -476,8 +471,8 @@ 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 nnpfs0 ch0 audio0 hotplug ptm local ppi0
-	R apci0 wscons uk0 random lkm pf systrace std st0 st1 fd
+	R pty0 diskmap vscsi0 ch0 audio0 hotplug ptm local ppi0 apci0
+	R wscons uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*|hd*)
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 0476ac59..3dc1699c 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.47 2011/10/22 19:31:23 miod Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.48 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -73,7 +73,6 @@
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pdc	PDC device
 #	pf*	Packet Filter
@@ -272,10 +271,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 32 $U 600
-	;;
-
 lkm)
 	M lkm c 19 0 640 _lkm
 	;;
@@ -507,7 +502,7 @@ 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 nnpfs0 bio ch0 audio0 audio1 audio2
+	R fd0G fd0H diskmap vscsi0 bio ch0 audio0 audio1 audio2
 	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall video0
 	R video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
 	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index 219496dd..591d1548 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/etc/etc.hppa64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.24 2011/10/22 19:31:23 miod Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.25 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -71,7 +71,6 @@
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pdc	PDC device
 #	pf*	Packet Filter
@@ -270,10 +269,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 32 $U 600
-	;;
-
 lkm)
 	M lkm c 19 0 640 _lkm
 	;;
@@ -497,10 +492,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 nnpfs0 ch0 audio0 audio1 audio2 ptm local wscons pci0
-	R pci1 pci2 pci3 uall video0 video1 uk0 random lpa0 lpa1 lpa2
-	R 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 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/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 6f19f5ec..a4c56f0f 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.62 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.63 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -85,7 +85,6 @@
 #	joy*	Joystick driver
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
-#	nnpfs*	NNPFS filesystem node
 #	nvram	NVRAM access
 #	pci*	PCI bus devices
 #	pctr*	PC Performance Tuning Register access device
@@ -319,10 +318,6 @@ nvram)
 	M nvram c 84 0 440 kmem
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 music*)
 	M music$U     c 53 $U
 	M sequencer$U c 53 $(($U+128))
@@ -600,13 +595,13 @@ 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 nnpfs0 ch0 audio0 audio1 audio2 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 music0 speaker video0 video1 uk0 random joy0
-	R joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
-	R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm
-	R crypto pf pctr systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 hotplug ptm
+	R gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 music0 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
 	;;
 
 wd*|sd*)
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index af7997eb..16e3e93b 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.26 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.27 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -70,7 +70,6 @@
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -278,10 +277,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -478,11 +473,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 nnpfs0 ch0 ttya audio0 audio1 audio2 hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1
-	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 music0
-	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 hotplug ptm
+	R local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2
+	R rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 music0 video0
+	R video1 uk0 random lkm crypto pf systrace wd0 wd1 wd2 wd3 std
+	R st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index c4c23b6a..f1f0348c 100644
--- a/src/etc/etc.loongson/MAKEDEV
+++ b/src/etc/etc.loongson/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.12 2011/10/22 19:31:23 miod Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.13 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -70,7 +70,6 @@
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -262,10 +261,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 hotplug)
 	M hotplug c 67 $U 400
 	;;
@@ -464,10 +459,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 nnpfs0 audio0 audio1 audio2 hotplug ptm
-	R 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 hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0 random
+	R tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2
+	R wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index 9a53d094..9a44be02 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.18 2011/10/06 20:49:27 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.19 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -57,7 +57,6 @@
 #	fd	fd/* nodes
 #	lcd	front panel LCD display
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
 #	*random	In-kernel random data source
@@ -238,10 +237,6 @@ pf*)
 	M pf c 39 0 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -375,8 +370,8 @@ 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 nnpfs0 ch0 ptm local
-	R wscons uk0 random lkm pf systrace std st0 st1 fd
+	R bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 ch0 ptm local wscons
+	R uk0 random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*)
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 75646a1d..1e4f416d 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.49 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.50 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -76,7 +76,6 @@
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -295,10 +294,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -533,12 +528,12 @@ all)
 	R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 vnd0 vnd1 vnd2
 	R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0
 	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 cuaa cuab ttya ttyb
-	R audio0 audio1 audio2 hotplug ptm local wscons pci0 pci1 pci2
-	R pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
-	R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 uk0
-	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R bpf8 bpf9 pty0 diskmap vscsi0 ch0 cuaa cuab ttya ttyb audio0
+	R audio1 audio2 hotplug ptm local wscons pci0 pci1 pci2 pci3
+	R iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
+	R rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 uk0 random
+	R lkm tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1
+	R wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/src/etc/etc.mvme68k/MAKEDEV b/src/etc/etc.mvme68k/MAKEDEV
index bc78e516..15ec95ce 100644
--- a/src/etc/etc.mvme68k/MAKEDEV
+++ b/src/etc/etc.mvme68k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.31 2011/10/06 20:49:27 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.32 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -56,7 +56,6 @@
 #	fd	fd/* nodes
 #	flash0	On-board flash memory
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -257,10 +256,6 @@ nvram0)
 	M nvram0 c 10 0 640 kmem
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -426,8 +421,8 @@ 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 nnpfs0 ch0 vmel0 vmes0 flash0 nvram0 sram0 ptm local
-	R uk0 random lkm pf systrace std st0 st1 fd
+	R vscsi0 ch0 vmel0 vmes0 flash0 nvram0 sram0 ptm local uk0
+	R random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*)
diff --git a/src/etc/etc.mvme88k/MAKEDEV b/src/etc/etc.mvme88k/MAKEDEV
index d5fa6657..3a0246b0 100644
--- a/src/etc/etc.mvme88k/MAKEDEV
+++ b/src/etc/etc.mvme88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.30 2011/10/06 20:49:27 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.31 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -51,7 +51,6 @@
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -252,10 +251,6 @@ nvram0)
 	M nvram0 c 10 0 640 kmem
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -381,8 +376,8 @@ 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 nnpfs0 ch0 vmel0 vmes0 nvram0 sram0 ptm local
-	R uk0 random lkm pf systrace std st0 st1 fd
+	R diskmap vscsi0 ch0 vmel0 vmes0 nvram0 sram0 ptm local uk0
+	R random lkm pf systrace std st0 st1 fd
 	;;
 
 sd*)
diff --git a/src/etc/etc.palm/MAKEDEV b/src/etc/etc.palm/MAKEDEV
index aabc747c..4c53f6ec 100644
--- a/src/etc/etc.palm/MAKEDEV
+++ b/src/etc/etc.palm/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.palm/MAKEDEV.md,v 1.11 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.palm/MAKEDEV.md,v 1.12 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -72,7 +72,6 @@
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
-#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
 #	radio*	FM tuner devices
@@ -279,10 +278,6 @@ pf*)
 	M pf c 46 0 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -491,8 +486,8 @@ 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 vscsi0
-	R nnpfs0 ch0 audio0 audio1 audio2 hotplug ptm local wscons
-	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R ch0 audio0 audio1 audio2 hotplug ptm local wscons uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
 	R tuner0 radio0 music0 video0 video1 uk0 random lkm tty00
 	R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std
 	R st0 st1 fd
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 5f06c791..7559f023 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.36 2012/03/28 20:44:23 miod Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.37 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -69,7 +69,6 @@
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -261,10 +260,6 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 hotplug)
 	M hotplug c 67 $U 400
 	;;
@@ -469,10 +464,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 nnpfs0 ch0 audio0 audio1 audio2 hotplug ptm
-	R 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 hotplug ptm local
+	R wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0 random
+	R tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3
+	R std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index 4a96a618..d9183255 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.17 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.18 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index 2bfb1128..71a1d9e0 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.49 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.50 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -71,7 +71,6 @@
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	openprom	PROM settings
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
@@ -263,10 +262,6 @@ openprom)
 	M openprom c 70 0  
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 112 0 640 _lkm
 	;;
@@ -522,8 +517,8 @@ all)
 	R cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2
 	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 nnpfs0 ch0 bio cuaa cuab cuac cuad ttya ttyb
-	R ttyc ttyd audio0 audio1 audio2 hotplug ptm local wscons uk0
+	R diskmap vscsi0 ch0 bio cuaa cuab cuac cuad ttya ttyb ttyc
+	R ttyd audio0 audio1 audio2 hotplug ptm local wscons uk0
 	R random lkm tty00 tty01 tty02 tty03 apm pf systrace xd0 xd1
 	R xd2 xd3 std st0 st1 fd
 	;;
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index dbfb45f5..3686f5aa 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.65 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.66 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -84,7 +84,6 @@
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	openprom	PROM settings
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
@@ -298,10 +297,6 @@ openprom)
 	M openprom c 70 0  
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 112 0 640 _lkm
 	;;
@@ -619,9 +614,9 @@ all)
 	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2
 	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C
-	R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 audio0
-	R audio1 audio2 hotplug ptm local wscons pci0 pci1 pci2 pci3
-	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0 audio1
+	R audio2 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
 	R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
 	R tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf systrace wd0
 	R wd1 wd2 wd3 std st0 st1 fd
diff --git a/src/etc/etc.vax/MAKEDEV b/src/etc/etc.vax/MAKEDEV
index 0289e3aa..4d300078 100644
--- a/src/etc/etc.vax/MAKEDEV
+++ b/src/etc/etc.vax/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.vax/MAKEDEV.md,v 1.48 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.vax/MAKEDEV.md,v 1.49 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -63,7 +63,6 @@
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
 #	*random	In-kernel random data source
@@ -280,10 +279,6 @@ pf*)
 	M pf c 42 0 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 74 $U 600
-	;;
-
 lkm)
 	M lkm c 28 0 640 _lkm
 	;;
@@ -473,9 +468,8 @@ 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 nnpfs0 ch0 audio0 ptm local wscons uk0
-	R random lkm pf systrace rx0 rx1 ra0 ra1 ra2 ra3 std st0 st1
-	R fd
+	R pty0 diskmap vscsi0 ch0 audio0 ptm local wscons uk0 random
+	R lkm pf systrace rx0 rx1 ra0 ra1 ra2 ra3 std st0 st1 fd
 	;;
 
 sd*|rx*|ra*|hd*)
diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index 4f0c8bdf..4f8bbc9e 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/etc/etc.zaurus/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.30 2012/04/06 15:18:41 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.59 2012/04/06 15:18:41 jsing Exp 
+#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.31 2012/08/23 06:15:28 deraadt Exp 
+#	OpenBSD: MAKEDEV.common,v 1.60 2012/08/23 06:15:28 deraadt Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.80 2011/04/18 16:52:10 thib Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -72,7 +72,6 @@
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
-#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
 #	radio*	FM tuner devices
@@ -279,10 +278,6 @@ pf*)
 	M pf c 46 0 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -491,11 +486,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 bio
-	R diskmap vscsi0 nnpfs0 ch0 hotplug ptm local wscons uall
-	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 music0 video0 video1 uk0 random lkm tty00
-	R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std
-	R st0 st1 fd
+	R diskmap vscsi0 ch0 hotplug ptm local wscons uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 music0 video0 video1 uk0 random lkm tty00 tty01 tty02
+	R tty03 apm crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)