diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 576ea030..ef094c52 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.69 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -339,13 +339,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 24 $U
+	M audio$U	c 24 $U
 	M mixer$U	c 24 $(($U+16))
-	M audio$U	c 24 $(($U+128))
 	M audioctl$U	c 24 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index af75b370..1ccb2f59 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.67 2016/09/02 17:06:13 goda Exp 
-#	OpenBSD: MAKEDEV.common,v 1.90 2016/09/02 17:06:13 goda Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.68 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -375,13 +375,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 42 $U
+	M audio$U	c 42 $U
 	M mixer$U	c 42 $(($U+16))
-	M audio$U	c 42 $(($U+128))
 	M audioctl$U	c 42 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.armv7/MAKEDEV b/src/etc/etc.armv7/MAKEDEV
index ca9fd002..437d8621 100644
--- a/src/etc/etc.armv7/MAKEDEV
+++ b/src/etc/etc.armv7/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.armv7/MAKEDEV.md,v 1.14 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -323,13 +323,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 36 $U
+	M audio$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
-	M audio$U	c 36 $(($U+128))
 	M audioctl$U	c 36 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 3f421e08..7573381f 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.hppa/MAKEDEV.md,v 1.60 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -301,13 +301,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 35 $U
+	M audio$U	c 35 $U
 	M mixer$U	c 35 $(($U+16))
-	M audio$U	c 35 $(($U+128))
 	M audioctl$U	c 35 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index f45d3206..ce60643d 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.82 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -380,13 +380,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 42 $U
+	M audio$U	c 42 $U
 	M mixer$U	c 42 $(($U+16))
-	M audio$U	c 42 $(($U+128))
 	M audioctl$U	c 42 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 9b4048e2..fddb6c7d 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.landisk/MAKEDEV.md,v 1.42 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -306,13 +306,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 36 $U
+	M audio$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
-	M audio$U	c 36 $(($U+128))
 	M audioctl$U	c 36 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index c7b0e567..0d8dff17 100644
--- a/src/etc/etc.loongson/MAKEDEV
+++ b/src/etc/etc.loongson/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.loongson/MAKEDEV.md,v 1.26 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -292,13 +292,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 44 $U
+	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
-	M audio$U	c 44 $(($U+128))
 	M audioctl$U	c 44 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index ab993b1d..b633226b 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.30 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -280,13 +280,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 26 $U
+	M audio$U	c 26 $U
 	M mixer$U	c 26 $(($U+16))
-	M audio$U	c 26 $(($U+128))
 	M audioctl$U	c 26 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index fcaa53f9..71b1aa36 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.macppc/MAKEDEV.md,v 1.69 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -328,13 +328,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 44 $U
+	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
-	M audio$U	c 44 $(($U+128))
 	M audioctl$U	c 44 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.octeon/MAKEDEV b/src/etc/etc.octeon/MAKEDEV
index 46b914fc..5c559b37 100644
--- a/src/etc/etc.octeon/MAKEDEV
+++ b/src/etc/etc.octeon/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.octeon/MAKEDEV.md,v 1.13 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -290,13 +290,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 44 $U
+	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
-	M audio$U	c 44 $(($U+128))
 	M audioctl$U	c 44 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 6c7a5236..bdb23bf1 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sgi/MAKEDEV.md,v 1.48 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -292,13 +292,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 44 $U
+	M audio$U	c 44 $U
 	M mixer$U	c 44 $(($U+16))
-	M audio$U	c 44 $(($U+128))
 	M audioctl$U	c 44 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index 31b9ebe0..419f8a2f 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.socppc/MAKEDEV.md,v 1.31 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index b6a221c7..5406db4d 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.86 2016/09/04 15:38:59 naddy Exp 
-#	OpenBSD: MAKEDEV.common,v 1.91 2016/09/04 15:38:59 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.92 2016/09/08 20:39:28 ratchov Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.82 2016/03/12 17:58:59 espie Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -352,13 +352,11 @@ bio)
 	;;
 
 audio*)
-	M sound$U	c 69 $U
+	M audio$U	c 69 $U
 	M mixer$U	c 69 $(($U+16))
-	M audio$U	c 69 $(($U+128))
 	M audioctl$U	c 69 $(($U+192))
 	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
 	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;