diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index ac5c4f53186e..fa1c9c63eb27 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.958 2011/10/02 19:29:41 pgoyette Exp $
+# $NetBSD: mi,v 1.959 2011/10/06 07:38:54 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -378,6 +378,7 @@
 ./usr/bin/atq					base-cron-bin
 ./usr/bin/atrm					base-cron-bin
 ./usr/bin/audioctl				base-audio-bin
+./usr/bin/audiocfg				base-audio-bin
 ./usr/bin/audioplay				base-audio-bin
 ./usr/bin/audiorecord				base-audio-bin
 ./usr/bin/awk					base-util-bin
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 583ae6d7ceba..31da6db521bb 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1688 2011/10/06 05:23:39 jruoho Exp $
+#	$NetBSD: mi,v 1.1689 2011/10/06 07:38:54 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3498,6 +3498,7 @@
 ./usr/libdata/debug/usr/bin/atf-sh.debug	comp-atf-debug		atf,debug
 ./usr/libdata/debug/usr/bin/atf-version.debug	comp-atf-debug		atf,debug
 ./usr/libdata/debug/usr/bin/audioctl.debug	comp-audio-debug	debug
+./usr/libdata/debug/usr/bin/audiocfg.debug	comp-audio-debug	debug
 ./usr/libdata/debug/usr/bin/audioplay.debug	comp-audio-debug	debug
 ./usr/libdata/debug/usr/bin/audiorecord.debug	comp-audio-debug	debug
 ./usr/libdata/debug/usr/bin/awk.debug		comp-util-debug		debug
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 2f8f1450dbb0..f277d37cab36 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1344 2011/09/29 23:35:48 sjg Exp $
+# $NetBSD: mi,v 1.1345 2011/10/06 07:38:55 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -65,6 +65,7 @@
 ./usr/share/man/cat1/atq.0			man-cron-catman		.cat
 ./usr/share/man/cat1/atrm.0			man-cron-catman		.cat
 ./usr/share/man/cat1/audioctl.0			man-audio-catman	.cat
+./usr/share/man/cat1/audiocfg.0			man-audio-catman	.cat
 ./usr/share/man/cat1/audioplay.0		man-audio-catman	.cat
 ./usr/share/man/cat1/audiorecord.0		man-audio-catman	.cat
 ./usr/share/man/cat1/audit-packages.0		man-obsolete		obsolete
@@ -2978,6 +2979,7 @@
 ./usr/share/man/html1/atq.html			man-cron-htmlman	html
 ./usr/share/man/html1/atrm.html			man-cron-htmlman	html
 ./usr/share/man/html1/audioctl.html		man-audio-htmlman	html
+./usr/share/man/html1/audiocfg.html		man-audio-htmlman	html
 ./usr/share/man/html1/audioplay.html		man-audio-htmlman	html
 ./usr/share/man/html1/audiorecord.html		man-audio-htmlman	html
 ./usr/share/man/html1/audit-packages.html	man-obsolete		obsolete
@@ -5504,6 +5506,7 @@
 ./usr/share/man/man1/atq.1			man-cron-man		.man
 ./usr/share/man/man1/atrm.1			man-cron-man		.man
 ./usr/share/man/man1/audioctl.1			man-audio-man		.man
+./usr/share/man/man1/audiocfg.1			man-audio-man		.man
 ./usr/share/man/man1/audioplay.1		man-audio-man		.man
 ./usr/share/man/man1/audiorecord.1		man-audio-man		.man
 ./usr/share/man/man1/audit-packages.1		man-obsolete		obsolete
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index b7626a345af0..cb1376e7e065 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.202 2011/07/03 21:58:52 tron Exp $
+#	$NetBSD: Makefile,v 1.203 2011/10/06 07:38:56 mrg Exp $
 #	from: @(#)Makefile	8.3 (Berkeley) 1/7/94
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos asa at audio \
+SUBDIR= apply apropos asa at audio audiocfg \
 	banner basename biff bthset btkey btpin \
 	bzip2 bzip2recover cal calendar cap_mkdb cdplay \
 	checknr chflags chpass cksum cmp col colcrt colrm \