diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index 8c4b2396..cd1f199b 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -280,7 +280,7 @@ speaker)
 	;;
 
 rmidi*)
-	M rmidi$U c 41 $U 666
+	M rmidi$U c 41 $U 660 _sndiop
 	;;
 
 *random)
@@ -347,10 +347,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 24 $U
-	M mixer$U	c 24 $(($U+16))
-	M audioctl$U	c 24 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 24 $U 660 _sndiop
+	M audioctl$U	c 24 $(($U+192)) 660 _sndiop
 	;;
 
 usb*)
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index e90b6d93..98849bf6 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -292,7 +292,7 @@ speaker)
 	;;
 
 rmidi*)
-	M rmidi$U c 52 $U 666
+	M rmidi$U c 52 $U 660 _sndiop
 	;;
 
 *random)
@@ -385,10 +385,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 42 $U
-	M mixer$U	c 42 $(($U+16))
-	M audioctl$U	c 42 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 42 $U 660 _sndiop
+	M audioctl$U	c 42 $(($U+192)) 660 _sndiop
 	;;
 
 apm*)
diff --git a/src/etc/etc.arm64/MAKEDEV b/src/etc/etc.arm64/MAKEDEV
index 3e9a70b2..b1c7879b 100644
--- a/src/etc/etc.arm64/MAKEDEV
+++ b/src/etc/etc.arm64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.7 2020/01/23 02:47:28 dlg Exp 
+#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.8 2020/03/12 16:38:58 patrick Exp 
 #	OpenBSD: MAKEDEV.common,v 1.109 2020/01/23 02:47:29 dlg Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -264,7 +264,7 @@ tun*)
 	;;
 
 rmidi*)
-	M rmidi$U c 52 $U 666
+	M rmidi$U c 52 $U 660 _sndiop
 	;;
 
 *random)
@@ -345,10 +345,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 42 $U
-	M mixer$U	c 42 $(($U+16))
-	M audioctl$U	c 42 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 42 $U 660 _sndiop
+	M audioctl$U	c 42 $(($U+192)) 660 _sndiop
 	;;
 
 apm*)
diff --git a/src/etc/etc.armv7/MAKEDEV b/src/etc/etc.armv7/MAKEDEV
index df4ba273..5af7cf61 100644
--- a/src/etc/etc.armv7/MAKEDEV
+++ b/src/etc/etc.armv7/MAKEDEV
@@ -260,7 +260,7 @@ tun*)
 	;;
 
 rmidi*)
-	M rmidi$U c 57 $U 666
+	M rmidi$U c 57 $U 660 _sndiop
 	;;
 
 *random)
@@ -331,10 +331,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 36 $U
-	M mixer$U	c 36 $(($U+16))
-	M audioctl$U	c 36 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 36 $U 660 _sndiop
+	M audioctl$U	c 36 $(($U+192)) 660 _sndiop
 	;;
 
 apm*)
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 8a6d71bf..18d867f1 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -309,10 +309,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 35 $U
-	M mixer$U	c 35 $(($U+16))
-	M audioctl$U	c 35 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 35 $U 660 _sndiop
+	M audioctl$U	c 35 $(($U+192)) 660 _sndiop
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index d1541705..996b47bc 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -288,7 +288,7 @@ speaker)
 	;;
 
 rmidi*)
-	M rmidi$U c 52 $U 666
+	M rmidi$U c 52 $U 660 _sndiop
 	;;
 
 *random)
@@ -385,10 +385,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 42 $U
-	M mixer$U	c 42 $(($U+16))
-	M audioctl$U	c 42 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 42 $U 660 _sndiop
+	M audioctl$U	c 42 $(($U+192)) 660 _sndiop
 	;;
 
 apm*)
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index b2a3a81c..2bc468ae 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -251,7 +251,7 @@ tun*)
 	;;
 
 rmidi*)
-	M rmidi$U c 57 $U 666
+	M rmidi$U c 57 $U 660 _sndiop
 	;;
 
 *random)
@@ -314,10 +314,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 36 $U
-	M mixer$U	c 36 $(($U+16))
-	M audioctl$U	c 36 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 36 $U 660 _sndiop
+	M audioctl$U	c 36 $(($U+192)) 660 _sndiop
 	;;
 
 usb*)
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index 793e2de2..6fef9efa 100644
--- a/src/etc/etc.loongson/MAKEDEV
+++ b/src/etc/etc.loongson/MAKEDEV
@@ -307,10 +307,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 44 $U
-	M mixer$U	c 44 $(($U+16))
-	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 44 $U 660 _sndiop
+	M audioctl$U	c 44 $(($U+192)) 660 _sndiop
 	;;
 
 apm*)
diff --git a/src/etc/etc.luna88k/MAKEDEV b/src/etc/etc.luna88k/MAKEDEV
index 9bb9b675..c64d73c3 100644
--- a/src/etc/etc.luna88k/MAKEDEV
+++ b/src/etc/etc.luna88k/MAKEDEV
@@ -292,10 +292,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 26 $U
-	M mixer$U	c 26 $(($U+16))
-	M audioctl$U	c 26 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 26 $U 660 _sndiop
+	M audioctl$U	c 26 $(($U+192)) 660 _sndiop
 	;;
 
 wsmouse[0-9]*)
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 825c8070..e1c97f92 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -261,7 +261,7 @@ tun*)
 	;;
 
 rmidi*)
-	M rmidi$U c 52 $U 666
+	M rmidi$U c 52 $U 660 _sndiop
 	;;
 
 *random)
@@ -338,10 +338,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 44 $U
-	M mixer$U	c 44 $(($U+16))
-	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 44 $U 660 _sndiop
+	M audioctl$U	c 44 $(($U+192)) 660 _sndiop
 	;;
 
 apm*)
diff --git a/src/etc/etc.octeon/MAKEDEV b/src/etc/etc.octeon/MAKEDEV
index 13a85c2b..148b2103 100644
--- a/src/etc/etc.octeon/MAKEDEV
+++ b/src/etc/etc.octeon/MAKEDEV
@@ -303,10 +303,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 44 $U
-	M mixer$U	c 44 $(($U+16))
-	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 44 $U 660 _sndiop
+	M audioctl$U	c 44 $(($U+192)) 660 _sndiop
 	;;
 
 fido)
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 81a2941c..1f35dc2e 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -300,10 +300,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 44 $U
-	M mixer$U	c 44 $(($U+16))
-	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 44 $U 660 _sndiop
+	M audioctl$U	c 44 $(($U+192)) 660 _sndiop
 	;;
 
 usb*)
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 0edd4df3..7e5b5adb 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -301,7 +301,7 @@ tun*)
 	;;
 
 rmidi*)
-	M rmidi$U c 68 $U 666
+	M rmidi$U c 68 $U 660 _sndiop
 	;;
 
 pppac*)
@@ -363,10 +363,8 @@ bio)
 	;;
 
 audio*)
-	M audio$U	c 69 $U
-	M mixer$U	c 69 $(($U+16))
-	M audioctl$U	c 69 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
+	M audio$U	c 69 $U 660 _sndiop
+	M audioctl$U	c 69 $(($U+192)) 660 _sndiop
 	;;
 
 usb*)