Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1e9bd5362dfd22b5802fac6596467b08635ad2e6)
+++ introduction/welcome/changelog.xml	(revision 7ffd4d7184fa43a0ebbc91590960b5b67da25453)
@@ -46,4 +46,7 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Updated to alsa-1.0.11.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Updated to dhcp-3.0.4.</para>
         </listitem>
Index: multimedia/libdriv/alsa-firmware.xml
===================================================================
--- multimedia/libdriv/alsa-firmware.xml	(revision 1e9bd5362dfd22b5802fac6596467b08635ad2e6)
+++ multimedia/libdriv/alsa-firmware.xml	(revision 7ffd4d7184fa43a0ebbc91590960b5b67da25453)
@@ -7,8 +7,8 @@
   <!ENTITY alsa-firmware-download-http "&alsa-download-http;/firmware/alsa-firmware-&alsa-firmware-version;.tar.bz2">
   <!ENTITY alsa-firmware-download-ftp  "&alsa-download-ftp;/firmware/alsa-firmware-&alsa-firmware-version;.tar.bz2">
-  <!ENTITY alsa-firmware-md5sum        "f7ce6a31691d6eb35fc155f306abc77b">
+  <!ENTITY alsa-firmware-md5sum        "bd573f4dac7f4786a20bb4427229acef">
   <!ENTITY alsa-firmware-size          "1.5 MB">
-  <!ENTITY alsa-firmware-buildsize     "18.4 MB">
-  <!ENTITY alsa-firmware-time          "0.1 SBU">
+  <!ENTITY alsa-firmware-buildsize     "18.6 MB">
+  <!ENTITY alsa-firmware-time          "less than 0.1 SBU">
 ]>
 <sect1 id="alsa-firmware" xreflabel="ALSA Firmware-&alsa-firmware-version;">
Index: multimedia/libdriv/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa-lib.xml	(revision 1e9bd5362dfd22b5802fac6596467b08635ad2e6)
+++ multimedia/libdriv/alsa-lib.xml	(revision 7ffd4d7184fa43a0ebbc91590960b5b67da25453)
@@ -7,8 +7,8 @@
   <!ENTITY alsa-lib-download-http "&alsa-download-http;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
   <!ENTITY alsa-lib-download-ftp  "&alsa-download-ftp;/lib/alsa-lib-&alsa-lib-version;.tar.bz2">
-  <!ENTITY alsa-lib-md5sum        "114af3304619920ffe2b147b760700b9">
-  <!ENTITY alsa-lib-size          "682 KB">
-  <!ENTITY alsa-lib-buildsize     "27.3 MB (additional 14.4 MB to build and install docs)">
-  <!ENTITY alsa-lib-time          "0.6 SBU">
+  <!ENTITY alsa-lib-md5sum        "ef7ae78a0ef08cbeacb295f2518886ab">
+  <!ENTITY alsa-lib-size          "696 KB">
+  <!ENTITY alsa-lib-buildsize     "31.8 MB (additional 15.2 MB to build and install docs)">
+  <!ENTITY alsa-lib-time          "0.7 SBU (less than 0.1 SBU to build and install docs)">
 ]>
 
@@ -73,9 +73,9 @@
     <title>Kernel Configuration</title>
 
-    <para>In the <quote>Sound</quote> section of the kernel configuration, edit
-    <emphasis role="bold">Advanced Linux Sound Architecture</emphasis>
-    options to match your audio hardware and disable deprecated
-    <emphasis role="bold">Open Sound System</emphasis>.
-    Recompile and install your new kernel.</para>
+    <para>In the Device Drivers &rArr; Sound &rArr; Advanced Linux Sound
+    Architecture section of the kernel configuration, select the settingis and
+    drivers appropriate for your hardware.  Ensure that the deprecated Device
+    Drivers &rArr; Sound &rArr; Open Sound System is <emphasis>not</emphasis>
+    selected.  If necessary, recompile and install your new kernel.</para>
 
     <indexterm zone="alsa-lib alsa-lib-kernel">
@@ -174,7 +174,7 @@
 
       <seglistitem>
-        <seg>alsalisp and aserver</seg>
-        <seg>libasound.{so,a}</seg>
-        <seg>/usr/include/alsa, /usr/share/alsa and
+        <seg>aserver</seg>
+        <seg>libasound.{so,a} and smixer-*.{so,a}</seg>
+        <seg>/usr/include/alsa, /usr/lib/alsa-lib, /usr/share/alsa and
         /usr/share/doc/alsa-lib-&alsa-lib-version;</seg>
       </seglistitem>
@@ -196,4 +196,14 @@
       </varlistentry>
 
+      <varlistentry id="smixer">
+        <term><filename class='libraryfile'>smixer-*.{so,a}</filename></term>
+        <listitem>
+          <para>provides hardware dependent ALSA mixer functions.</para>
+          <indexterm zone="alsa-lib smixer">
+            <primary sortas="c-smixer">smixer-*.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: multimedia/libdriv/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa-oss.xml	(revision 1e9bd5362dfd22b5802fac6596467b08635ad2e6)
+++ multimedia/libdriv/alsa-oss.xml	(revision 7ffd4d7184fa43a0ebbc91590960b5b67da25453)
@@ -7,8 +7,8 @@
   <!ENTITY alsa-oss-download-http "&alsa-download-http;/oss-lib/alsa-oss-&alsa-oss-version;.tar.bz2">
   <!ENTITY alsa-oss-download-ftp  "&alsa-download-ftp;/oss-lib/alsa-oss-&alsa-oss-version;.tar.bz2">
-  <!ENTITY alsa-oss-md5sum        "3c0411e54fd2e5c6083fd3c2ac9db509">
-  <!ENTITY alsa-oss-size          "219 KB">
-  <!ENTITY alsa-oss-buildsize     "2.5 MB">
-  <!ENTITY alsa-oss-time          "0.1 SBU">
+  <!ENTITY alsa-oss-md5sum        "3106c2d59a329263867fa3dd44133dda">
+  <!ENTITY alsa-oss-size          "232 KB">
+  <!ENTITY alsa-oss-buildsize     "2.8 MB">
+  <!ENTITY alsa-oss-time          "less than 0.1 SBU">
 ]>
 
Index: multimedia/libdriv/alsa-plugins.xml
===================================================================
--- multimedia/libdriv/alsa-plugins.xml	(revision 1e9bd5362dfd22b5802fac6596467b08635ad2e6)
+++ multimedia/libdriv/alsa-plugins.xml	(revision 7ffd4d7184fa43a0ebbc91590960b5b67da25453)
@@ -7,8 +7,8 @@
   <!ENTITY alsa-plugins-download-http "&alsa-download-http;/plugins/alsa-plugins-&alsa-plugins-version;.tar.bz2">
   <!ENTITY alsa-plugins-download-ftp  "&alsa-download-ftp;/plugins/alsa-plugins-&alsa-plugins-version;.tar.bz2">
-  <!ENTITY alsa-plugins-md5sum        "15a3fbbea779736b6425f43bbd051a32">
-  <!ENTITY alsa-plugins-size          "187 KB">
-  <!ENTITY alsa-plugins-buildsize     "1.8">
-  <!ENTITY alsa-plugins-time          "0.1 SBU">
+  <!ENTITY alsa-plugins-md5sum        "4ca9ebb9f59b6d9bd85c904134a78305">
+  <!ENTITY alsa-plugins-size          "236 KB">
+  <!ENTITY alsa-plugins-buildsize     "2.4 MB">
+  <!ENTITY alsa-plugins-time          "less than 0.1 SBU">
 ]>
 
@@ -60,4 +60,5 @@
     </itemizedlist>
 
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -67,4 +68,5 @@
       </listitem>
     </itemizedlist>
+-->
 
     <bridgehead renderas="sect3">ALSA Plugins Dependencies</bridgehead>
@@ -85,4 +87,5 @@
     <title>Installation of ALSA Plugins</title>
 
+<!--
     <para>If you choose not to install <application>JACK</application>,
     apply the patch by running the following commands:</para>
@@ -90,4 +93,5 @@
 <screen><userinput>patch -Np1 -i \
     ../alsa-plugins-&alsa-plugins-version;-no_jack-1.patch</userinput></screen>
+-->
 
     <para>Install <application>ALSA Plugins</application> by
@@ -115,6 +119,7 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libasound_module_pcm_oss.so and optionally
-        libasound_module_pcm_jack.so</seg>
+        <seg>libasound_module_pcm_oss.so, libasound_module_ctl_oss.so, 
+        libasound_module_pcm_upmix.so, libasound_module_pcm_vdownmix.so, 
+        and optionally libasound_module_pcm_jack.so</seg>
         <seg>/usr/lib/alsa-lib</seg>
       </seglistitem>
Index: multimedia/libdriv/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa-tools.xml	(revision 1e9bd5362dfd22b5802fac6596467b08635ad2e6)
+++ multimedia/libdriv/alsa-tools.xml	(revision 7ffd4d7184fa43a0ebbc91590960b5b67da25453)
@@ -19,5 +19,5 @@
   <!ENTITY alsa-tools-download-http "&alsa-download-http;/tools/alsa-tools-&alsa-tools-version;.tar.bz2">
   <!ENTITY alsa-tools-download-ftp  "&alsa-download-ftp;/tools/alsa-tools-&alsa-tools-version;.tar.bz2">
-  <!ENTITY alsa-tools-md5sum        "3139b9d6c10e14acbb926f23b488e745">
+  <!ENTITY alsa-tools-md5sum        "a2840af7f1624d46257b6a53aea43eb7">
   <!ENTITY alsa-tools-size          "1.4 MB">
   <!ENTITY alsa-tools-buildsize     "14-17 MB depending on the tool being built">
Index: multimedia/libdriv/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa-utils.xml	(revision 1e9bd5362dfd22b5802fac6596467b08635ad2e6)
+++ multimedia/libdriv/alsa-utils.xml	(revision 7ffd4d7184fa43a0ebbc91590960b5b67da25453)
@@ -7,7 +7,7 @@
   <!ENTITY alsa-utils-download-http "&alsa-download-http;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
   <!ENTITY alsa-utils-download-ftp  "&alsa-download-ftp;/utils/alsa-utils-&alsa-utils-version;.tar.bz2">
-  <!ENTITY alsa-utils-md5sum        "d4b77e9fe0311772293e402fdd634ad2">
-  <!ENTITY alsa-utils-size          "935 KB">
-  <!ENTITY alsa-utils-buildsize     "5.9 MB">
+  <!ENTITY alsa-utils-md5sum        "ba9b8010120701d0f6daf061d392cfa2">
+  <!ENTITY alsa-utils-size          "972 KB">
+  <!ENTITY alsa-utils-buildsize     "6.8 MB">
   <!ENTITY alsa-utils-time          "0.1 SBU">
 ]>
@@ -128,9 +128,9 @@
 alsactl store</userinput></screen>
 
-      <para>The volume settings will be restored from the saved state using a
-      shell script called by <application>Udev</application> that will
-      execute when the device is detected (during boot or when plugged in for
-      USB devices).</para>
-
+      <para>The volume settings will be restored from the saved state by
+      <application>Udev</application> when the device is detected (during boot
+      or when plugged in for USB devices).</para>
+
+<!--
       <para>  While still the
       <systemitem class="username">root</systemitem> user, create the
@@ -144,24 +144,20 @@
 # $1 is (the numbered device "%n") passed in by udev/kernel.
 
-x=0
-
-# Give up to 20 seconds for /usr to be mounted
-while [ "${x}" -lt 20 ]
-do
+    rc=1
+
     if [ -f /usr/sbin/alsactl ]; then
         /usr/sbin/alsactl restore "${1}"
-        exit 0
+        rc=$?
     fi
-    x=$(( x + 1 ))
-    sleep 1
-done &amp; # Put the loop in the background
+
+    exit $rc
 
 # End /etc/udev/scripts/alsa-restore
 EOF
 chmod -v 754 /etc/udev/scripts/alsa-restore</userinput></screen>
-
-      <para>Finally, again as the
-      <systemitem class="username">root</systemitem> user, install a new
-      <application>Udev</application> rules file to create the audio
+-->
+
+      <para>As the <systemitem class="username">root</systemitem> user, install
+      a new <application>Udev</application> rules file to create the audio
       device nodes and run the restore script:</para>
 
@@ -173,5 +169,5 @@
 # ALSA Devices
 # When a sound device is detected, restore the volume settings
-KERNEL=="controlC[0-9]*", ACTION=="add", NAME="snd/%k", RUN="/etc/udev/scripts/alsa-restore %n"
+KERNEL=="controlC[0-9]*", ACTION=="add", RUN+="/usr/sbin/alsactl restore %n"
 KERNEL="hw[CD0-9]*",      NAME="snd/%k"
 KERNEL="pcm[CD0-9cp]*",   NAME="snd/%k"
@@ -195,6 +191,7 @@
 
       <seglistitem>
-        <seg>aconnect, alsaconf, alsactl, alsamixer, amidi, amixer, aplay, aplaymidi,
-        arecord, arecordmidi, aseqnet, aseqdump, iecset, and speaker-test</seg>
+        <seg>aconnect, alsaconf, alsactl, alsamixer, amidi, 
+        amixer, aplay, aplaymidi, arecord, arecordmidi, aseqnet, 
+        aseqdump, iecset, and speaker-test</seg>
         <seg>None</seg>
         <seg>None</seg>
