diff --git a/etc/etc.acorn26/MAKEDEV.conf b/etc/etc.acorn26/MAKEDEV.conf
index 4c306b531b7f..f13fd456500f 100644
--- a/etc/etc.acorn26/MAKEDEV.conf
+++ b/etc/etc.acorn26/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.6 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev wscons
@@ -8,7 +8,7 @@ all_md)
 	;;
 
 ramdisk)
-	makedev std wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std bpf wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev opty ttyE0 wskbd0 ttyEcfg
 	makedev cd0 cd1
 	;;
diff --git a/etc/etc.acorn32/MAKEDEV.conf b/etc/etc.acorn32/MAKEDEV.conf
index 86fee9778ff0..407b094105ee 100644
--- a/etc/etc.acorn32/MAKEDEV.conf
+++ b/etc/etc.acorn32/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.9 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.10 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -14,7 +14,7 @@ all_md)
 	;;
 
 ramdisk|floppy)
-	makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std bpf fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev tty0 tty1 opty
 	makedev st0 st1 cd0 cd1
 	;;
diff --git a/etc/etc.bebox/MAKEDEV.conf b/etc/etc.bebox/MAKEDEV.conf
index fe32762aacba..be25d713279c 100644
--- a/etc/etc.bebox/MAKEDEV.conf
+++ b/etc/etc.bebox/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2010/10/17 10:55:01 kiyohara Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
@@ -16,7 +16,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
+	makedev std bpf fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
 	makedev cd0 cd1 ttyE0 opty
 	;;
 
diff --git a/etc/etc.cats/MAKEDEV.conf b/etc/etc.cats/MAKEDEV.conf
index c2fe33614ee9..d91f85c62f93 100644
--- a/etc/etc.cats/MAKEDEV.conf
+++ b/etc/etc.cats/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev wscons std_cats fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -23,8 +23,7 @@ std_cats)
 	;;
 
 ramdisk|floppy)
-	makedev std std_cats fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std bpf std_cats bpf
 	makedev tty0 tty1 opty ttyv0
-	makedev st0 st1 cd0 cd1
-	makedev bpf
+	makedev fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 st0 st1 cd0 cd1
 	;;
diff --git a/etc/etc.dreamcast/MAKEDEV.conf b/etc/etc.dreamcast/MAKEDEV.conf
index 6202e44e52ce..7f7adcbe716c 100644
--- a/etc/etc.dreamcast/MAKEDEV.conf
+++ b/etc/etc.dreamcast/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev wscons gdrom0 maple
@@ -8,9 +8,9 @@ all_md)
 	;;
 
 ramdisk)
-	makedev std md0 gdrom0
+	makedev std bpf md0 gdrom0
 	makedev scif0 sci0 opty
-	makedev ttyE0 ttyEcfg wsmouse0 wskbd0 bpf tun0 tun1 ipl
+	makedev ttyE0 ttyEcfg wsmouse0 wskbd0 tun0 tun1 ipl
 	;;
 
 maple)
diff --git a/etc/etc.evbarm/MAKEDEV.conf b/etc/etc.evbarm/MAKEDEV.conf
index 838fd448aff9..e10f93706a2a 100644
--- a/etc/etc.evbarm/MAKEDEV.conf
+++ b/etc/etc.evbarm/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2011/03/20 03:00:56 nonaka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.6 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 ld0
@@ -17,7 +17,7 @@ all_md)
 	;;
 
 ramdisk|floppy)
-	makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 ld0
+	makedev std bpf fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 ld0
 	makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7
 	makedev tty0 tty1 opty
 	makedev st0 st1 cd0 cd1
diff --git a/etc/etc.evbppc/MAKEDEV.conf b/etc/etc.evbppc/MAKEDEV.conf
index 2b7d78c6609b..53a245c761ff 100644
--- a/etc/etc.evbppc/MAKEDEV.conf
+++ b/etc/etc.evbppc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:10 apb Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1
@@ -21,6 +21,7 @@ all_md)
 	makedev cfs
 	;;
 
+# No bpf?
 ramdisk)
 	makedev md0
 	;;
diff --git a/etc/etc.evbsh3/MAKEDEV.conf b/etc/etc.evbsh3/MAKEDEV.conf
index f09eb6cbc645..1fc96bd4d4b4 100644
--- a/etc/etc.evbsh3/MAKEDEV.conf
+++ b/etc/etc.evbsh3/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.6 2010/04/06 15:54:31 nonaka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.7 2012/08/16 13:31:24 abs Exp $
 
 all_md)
 	makedev tty0 tty1
@@ -8,7 +8,7 @@ all_md)
 	;;
 
 ramdisk)
-	makedev std md0 ld0 wd0
+	makedev std bpf md0 ld0 wd0
 	makedev tty0 tty1 opty
-	makedev bpf tun0 tun1 ipl
+	makedev tun0 tun1 ipl
 	;;
diff --git a/etc/etc.ews4800mips/MAKEDEV.conf b/etc/etc.ews4800mips/MAKEDEV.conf
index 74bc28732bad..6f848e61f259 100644
--- a/etc/etc.ews4800mips/MAKEDEV.conf
+++ b/etc/etc.ews4800mips/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.1 2005/12/29 15:28:36 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.2 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev wscons sd0 sd1 sd2 sd3 cd0 st0 st1
@@ -7,7 +7,7 @@ all_md)
 	;;
 
 ramdisk)
-	makedev std sd0 sd1 sd2 sd3 cd0 st0 opty ttyZ0 ttyZ1 md0
+	makedev std bpf sd0 sd1 sd2 sd3 cd0 st0 opty ttyZ0 ttyZ1 md0
 	makedev scsibus0 scsibus1 scsibus2 scsibus3
 	makedev ttyEcfg ttyE0 wskbd0 wskbd
 	;;
diff --git a/etc/etc.hpcarm/MAKEDEV.conf b/etc/etc.hpcarm/MAKEDEV.conf
index a7fc6062e666..9f596a420dfa 100644
--- a/etc/etc.hpcarm/MAKEDEV.conf
+++ b/etc/etc.hpcarm/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.12 2011/02/26 18:07:17 ahoka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.13 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev wscons std_hpcarm fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -26,7 +26,8 @@ std_hpcarm)
 	;;
 
 ramdisk|floppy)
-	makedev std std_hpcarm fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std std_hpcarm bpf
+	makedev fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7
 	makedev tty0 tty1 opty
 	makedev st0 st1 cd0 cd1
diff --git a/etc/etc.hpcmips/MAKEDEV.conf b/etc/etc.hpcmips/MAKEDEV.conf
index 5546d23664af..51e67bcb660c 100644
--- a/etc/etc.hpcmips/MAKEDEV.conf
+++ b/etc/etc.hpcmips/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2011/02/26 18:07:17 ahoka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.6 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
@@ -17,7 +17,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 fd1 wd0 wd1 sd0 sd1 sd2 tty0 tty1 tty2
+	makedev std bpf fd0 fd1 wd0 wd1 sd0 sd1 sd2 tty0 tty1 tty2
 	makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7
 	makedev st0 st1 cd0 cd1 opty
 	;;
diff --git a/etc/etc.hpcsh/MAKEDEV.conf b/etc/etc.hpcsh/MAKEDEV.conf
index 9a46ce46f837..b94c5423ff8f 100644
--- a/etc/etc.hpcsh/MAKEDEV.conf
+++ b/etc/etc.hpcsh/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2004/07/03 14:59:17 uch Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev wscons wd0 wd1 sd0 sd1
@@ -9,6 +9,6 @@ all_md)
 	;;
 
 ramdisk)
-	makedev std md0
+	makedev std bpf md0
 	makedev scif0 sci0
 	;;
diff --git a/etc/etc.i386/MAKEDEV.conf b/etc/etc.i386/MAKEDEV.conf
index b79ec636a923..9f863d36d655 100644
--- a/etc/etc.i386/MAKEDEV.conf
+++ b/etc/etc.i386/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.22 2012/04/07 17:22:10 christos Exp $
+# $NetBSD: MAKEDEV.conf,v 1.23 2012/08/16 13:31:25 abs Exp $
 
 # As of 2005-03-15, the "init" case must not create more than 1024 entries.
 all_md)
@@ -51,7 +51,7 @@ xen)
 	;;
 
 floppy)
-	makedev std wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4 st0 st1
+	makedev std bpf wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4 st0 st1
 	makedev tty0 tty1 tty2 cd0 cd1 mcd0 ttyv0 opty ld0 ld1 ld2 ld3 ed0 ed1
 	;;
 
diff --git a/etc/etc.ibmnws/MAKEDEV.conf b/etc/etc.ibmnws/MAKEDEV.conf
index a54c789590d1..12ea362c12ed 100644
--- a/etc/etc.ibmnws/MAKEDEV.conf
+++ b/etc/etc.ibmnws/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev sd0 sd1 sd2 sd3 sd4
@@ -11,7 +11,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std sd0 sd1 sd2 tty0 tty1
+	makedev std bpf sd0 sd1 sd2 tty0 tty1
 	makedev cd0 cd1 opty
 	;;
 
diff --git a/etc/etc.iyonix/MAKEDEV.conf b/etc/etc.iyonix/MAKEDEV.conf
index afa1948d8ebe..353206e37795 100644
--- a/etc/etc.iyonix/MAKEDEV.conf
+++ b/etc/etc.iyonix/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -16,7 +16,7 @@ all_md)
 	;;
 
 ramdisk|floppy)
-	makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std bpf fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev tty0 tty1 opty
 	makedev st0 st1 cd0 cd1
 	;;
diff --git a/etc/etc.landisk/MAKEDEV.conf b/etc/etc.landisk/MAKEDEV.conf
index da4266ee416e..f738653a0f5b 100644
--- a/etc/etc.landisk/MAKEDEV.conf
+++ b/etc/etc.landisk/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.5 2009/12/22 11:12:40 nonaka Exp $
+# $NetBSD: MAKEDEV.conf,v 1.6 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev std
@@ -25,7 +25,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std
+	makedev std bpf
 	makedev wd0 wd1 wd2 wd3 md0
 	makedev sd0 sd1 sd2 sd3 cd0
 	makedev ccd0
diff --git a/etc/etc.luna68k/MAKEDEV.conf b/etc/etc.luna68k/MAKEDEV.conf
index d262c0ab4efa..6f87b77e48db 100644
--- a/etc/etc.luna68k/MAKEDEV.conf
+++ b/etc/etc.luna68k/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.6 2011/12/02 16:01:50 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.7 2012/08/16 13:31:25 abs Exp $
 
 all_md)
 	makedev ttya sd0 sd1 sd2 sd3 cd0 cd1 st0 st1
@@ -15,7 +15,7 @@ tty[ab])
 	;;
 
 ramdisk)
-	makedev std sd0 sd1 cd0 st0 st1 md0
+	makedev std bpf sd0 sd1 cd0 st0 st1 md0
 	makedev opty ttya
 	makedev ttyEcfg ttyE0 wskbd0
 	makedev scsibus0 scsibus1
diff --git a/etc/etc.mipsco/MAKEDEV.conf b/etc/etc.mipsco/MAKEDEV.conf
index 44a00dc2c011..ab11a779a68c 100644
--- a/etc/etc.mipsco/MAKEDEV.conf
+++ b/etc/etc.mipsco/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2007/01/15 23:35:12 hubertf Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2012/08/16 13:31:26 abs Exp $
 
 all_md)
 	makedev sd0 sd1 sd2 sd3 cd0 st0 st1
@@ -8,7 +8,7 @@ all_md)
 	;;
 
 minimal|ramdisk)
-	makedev std fd
+	makedev std bpf fd
 	makedev sd0 sd1 sd2 sd3 sd4 st0 st1 ch0 cd0 cd1 ccd0 ccd1
 	makedev md0 opty tty0 tty1
 	;;
diff --git a/etc/etc.mmeye/MAKEDEV.conf b/etc/etc.mmeye/MAKEDEV.conf
index 4f4e916208ad..5feca632f992 100644
--- a/etc/etc.mmeye/MAKEDEV.conf
+++ b/etc/etc.mmeye/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.6 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.7 2012/08/16 13:31:26 abs Exp $
 
 all_md)
 	makedev wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
@@ -12,7 +12,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std wd0 wd1 sd0 sd1 sd2 tty0 tty1
+	makedev std bpf wd0 wd1 sd0 sd1 sd2 tty0 tty1
 	makedev st0 st1 cd0 cd1 opty
 	;;
 
diff --git a/etc/etc.mvmeppc/MAKEDEV.conf b/etc/etc.mvmeppc/MAKEDEV.conf
index a5055e6e1d2b..aa55862b2da6 100644
--- a/etc/etc.mvmeppc/MAKEDEV.conf
+++ b/etc/etc.mvmeppc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.6 2007/01/15 23:35:12 hubertf Exp $
+# $NetBSD: MAKEDEV.conf,v 1.7 2012/08/16 13:31:26 abs Exp $
 
 all_md)
 	makedev sd0 sd1 sd2 sd3 sd4
@@ -12,7 +12,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std sd0 sd1 sd2 tty0 tty1
+	makedev std bpf sd0 sd1 sd2 tty0 tty1
 	makedev cd0 cd1 opty
 	;;
 
diff --git a/etc/etc.netwinder/MAKEDEV.conf b/etc/etc.netwinder/MAKEDEV.conf
index a37b8ddaeda3..00272f314378 100644
--- a/etc/etc.netwinder/MAKEDEV.conf
+++ b/etc/etc.netwinder/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.4 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.5 2012/08/16 13:31:26 abs Exp $
 
 all_md)
 	makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -15,7 +15,7 @@ all_md)
 	;;
 
 ramdisk|floppy)
-	makedev std fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std bpf fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev tty0 tty1 opty ttyv0
 	makedev st0 st1 cd0 cd1
 	;;
diff --git a/etc/etc.ofppc/MAKEDEV.conf b/etc/etc.ofppc/MAKEDEV.conf
index 8d269994c09b..9330b3a34b09 100644
--- a/etc/etc.ofppc/MAKEDEV.conf
+++ b/etc/etc.ofppc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2011/09/06 14:40:11 apb Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2012/08/16 13:31:26 abs Exp $
 
 all_md)
 	makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 fd0 fd1
@@ -20,7 +20,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std sd0 sd1 sd2 tty00 tty01 tty10 tty11 opty
+	makedev std bpf sd0 sd1 sd2 tty00 tty01 tty10 tty11 opty
 	makedev st0 st1 cd0 cd1 wd0 wd1 md0 fd0 fd1
 	makedev ttyE0 wsmouse0 wskbd0 ttyEcfg
 	makedev raid0 raid1 raid2 raid3 raid4 raid5 raid6 raid7
diff --git a/etc/etc.prep/MAKEDEV.conf b/etc/etc.prep/MAKEDEV.conf
index ce4b3fb3a5ec..b0b455ed682f 100644
--- a/etc/etc.prep/MAKEDEV.conf
+++ b/etc/etc.prep/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.7 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.8 2012/08/16 13:31:26 abs Exp $
 
 all_md)
 	makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4
@@ -20,7 +20,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
+	makedev std bpf fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
 	makedev cd0 cd1 ttyE0 opty
 	;;
 
diff --git a/etc/etc.rs6000/MAKEDEV.conf b/etc/etc.rs6000/MAKEDEV.conf
index 1c71e3834866..1734c4e67f4b 100644
--- a/etc/etc.rs6000/MAKEDEV.conf
+++ b/etc/etc.rs6000/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.2 2012/02/23 09:35:44 martin Exp $
+# $NetBSD: MAKEDEV.conf,v 1.3 2012/08/16 13:31:26 abs Exp $
 
 all_md)
 	makedev wscons fd0 fd1 sd0 sd1 sd2 sd3 sd4
@@ -19,7 +19,7 @@ all_md)
 	;;
 
 floppy)
-	makedev std fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
+	makedev std bpf fd0 wd0 wd1 sd0 sd1 sd2 tty0 tty1
 	makedev cd0 cd1 ttyE0 opty
 	;;
 
diff --git a/etc/etc.sandpoint/MAKEDEV.conf b/etc/etc.sandpoint/MAKEDEV.conf
index 00b1099ec330..b8a7f773a0de 100644
--- a/etc/etc.sandpoint/MAKEDEV.conf
+++ b/etc/etc.sandpoint/MAKEDEV.conf
@@ -1,9 +1,9 @@
-# $NetBSD: MAKEDEV.conf,v 1.15 2012/06/21 19:22:07 jdc Exp $
+# $NetBSD: MAKEDEV.conf,v 1.16 2012/08/16 13:31:26 abs Exp $
 
 init)
-	makedev std tty00 tty01 opty ptm pty0
+	makedev std bpf tty00 tty01 opty ptm pty0
 	makedev md0 wd0 wd1 raid0
-	makedev pci0 bpf clockctl
+	makedev pci0 clockctl
 	;;
 
 all_md)
diff --git a/etc/etc.shark/MAKEDEV.conf b/etc/etc.shark/MAKEDEV.conf
index 3b54aaa177c7..8c3bb5fd8a20 100644
--- a/etc/etc.shark/MAKEDEV.conf
+++ b/etc/etc.shark/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.12 2008/09/13 11:46:18 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.13 2012/08/16 13:31:27 abs Exp $
 
 all_md)
 	makedev wscons wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
@@ -12,9 +12,8 @@ all_md)
 	;;
 
 ramdisk|floppy)
-	makedev std wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
+	makedev std bpf wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3
 	makedev tty0 tty1 opty ttyv0
 	makedev st0 st1 cd0 cd1
-	makedev bpf
 	makedev wscons # needed by the ramdisk's .profile and sysinst
 	;;
diff --git a/etc/etc.sparc/MAKEDEV.conf b/etc/etc.sparc/MAKEDEV.conf
index 5350acd09a4e..3ce5d1761f91 100644
--- a/etc/etc.sparc/MAKEDEV.conf
+++ b/etc/etc.sparc/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.14 2011/09/06 14:40:11 apb Exp $
+# $NetBSD: MAKEDEV.conf,v 1.15 2012/08/16 13:31:27 abs Exp $
 
 all_md)
 	makedev std_sparc ttya ttyb ttyc ttyd ttyC00 ttyC01
@@ -33,7 +33,7 @@ std_sparc)
 	;;
 
 floppy|ramdisk)
-	makedev std std_sparc ttya ttyb ttyc ttyd opty
+	makedev std std_sparc bpf ttya ttyb ttyc ttyd opty
 	makedev sd0 sd1 sd2 sd3 sd4 sd5 md0
 	makedev wd0 wd1 wd2 wd3 cd0 cd1 st0 st1 fd0
 	;;
diff --git a/etc/etc.sparc64/MAKEDEV.conf b/etc/etc.sparc64/MAKEDEV.conf
index 4ef14a9e8d1c..077fbb6b390a 100644
--- a/etc/etc.sparc64/MAKEDEV.conf
+++ b/etc/etc.sparc64/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.14 2010/01/18 10:35:18 jdc Exp $
+# $NetBSD: MAKEDEV.conf,v 1.15 2012/08/16 13:31:27 abs Exp $
 
 all_md)
 	makedev std_sparc64 ttya ttyb ttyc ttyd ttyC00 ttyC01
@@ -43,7 +43,7 @@ floppy)
 	;;
 
 ramdisk)
-	makedev std std_sparc64 ttya ttyb ttyc ttyd opty
+	makedev std bpf std_sparc64 ttya ttyb ttyc ttyd opty
 	makedev sd0 sd1 sd2 sd3 sd4 sd5 md0
 	makedev wd0 wd1 wd2 wd3 cd0 cd1 st0 st1 fd0
 	makedev raid0 raid1 raid2 raid3
diff --git a/etc/etc.x68k/MAKEDEV.conf b/etc/etc.x68k/MAKEDEV.conf
index 50ffc97b6d05..424ebd1e730c 100644
--- a/etc/etc.x68k/MAKEDEV.conf
+++ b/etc/etc.x68k/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2012/04/29 07:19:08 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.14 2012/08/16 13:31:27 abs Exp $
 
 all_md)
 	makedev std_x68k st0 st1 ttye0 ttye1 mouse0 mouse1
@@ -22,7 +22,7 @@ std_x68k)
 	;;
 
 floppy)
-	makedev std std_x68k fd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6
+	makedev std bpf std_x68k fd0 sd0 sd1 sd2 sd3 sd4 sd5 sd6
 	makedev tty00 cd0 ttye0 opty
 	;;
 
diff --git a/etc/etc.zaurus/MAKEDEV.conf b/etc/etc.zaurus/MAKEDEV.conf
index 804de2a95949..fbb963a62171 100644
--- a/etc/etc.zaurus/MAKEDEV.conf
+++ b/etc/etc.zaurus/MAKEDEV.conf
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2011/05/20 08:29:05 tsutsui Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2012/08/16 13:31:27 abs Exp $
 
 all_md)
 	makedev wscons wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 ld0
@@ -19,7 +19,7 @@ all_md)
 	;;
 
 ramdisk)
-	makedev std wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 ld0
+	makedev std bpf wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 ld0
 	makedev tty0 tty1 opty
 	makedev st0 st1 cd0 cd1
 	makedev wscons