Index: general.ent
===================================================================
--- general.ent	(revision 48d0ea5b032d8f00abed240fd76753f89c455c7c)
+++ general.ent	(revision e8ec9467e97011cf257d5e3345b95e1c01abddbd)
@@ -133,6 +133,6 @@
 <!ENTITY libgcrypt-version            "1.2.4">
 <!ENTITY libksba-version              "1.0.2">
-<!ENTITY Mowgli-version               "0.6.1">
-<!ENTITY mcs-version                  "0.7.0">
+<!ENTITY libmowgli-version            "0.7.0">
+<!ENTITY libmcs-version               "0.7.1">
 
 <!-- Obsolete
@@ -662,5 +662,5 @@
 <!ENTITY CDParanoia-version           "III-9.8">
 <!ENTITY freetts-version              "1.2.1">
-<!ENTITY audacious-version            "1.3.2">
+<!ENTITY audacious-version            "1.5.1">
 <!ENTITY amarok-version               "1.4.8">
 
Index: general/genlib/mcs.xml
===================================================================
--- general/genlib/mcs.xml	(revision 48d0ea5b032d8f00abed240fd76753f89c455c7c)
+++ general/genlib/mcs.xml	(revision e8ec9467e97011cf257d5e3345b95e1c01abddbd)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY mcs-download-http "http://distfiles.atheme.org/libmcs-&mcs-version;.tgz">
-  <!ENTITY mcs-download-ftp  " ">
-  <!ENTITY mcs-md5sum        "0f0c779609b3481a79937c2e86660a99">
-  <!ENTITY mcs-size          "103 KB">
-  <!ENTITY mcs-buildsize     "1.3 MB">
-  <!ENTITY mcs-time          "less than 0.1 SBU">
+  <!ENTITY libmcs-download-http "http://distfiles.atheme.org/libmcs-&libmcs-version;.tgz">
+  <!ENTITY libmcs-download-ftp  " ">
+  <!ENTITY libmcs-md5sum        "1611a7bd7e7b07df3d889012d133c440">
+  <!ENTITY libmcs-size          "105 KB">
+  <!ENTITY libmcs-buildsize     "1.7 MB">
+  <!ENTITY libmcs-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="mcs" xreflabel="mcs-&mcs-version;">
+<sect1 id="libmcs" xreflabel="libmcs-&libmcs-version;">
   <?dbhtml filename="mcs.html"?>
 
@@ -21,18 +21,18 @@
   </sect1info>
 
-  <title>mcs-&mcs-version;</title>
-
-  <indexterm zone="mcs">
-    <primary sortas="a-mcs">mcs</primary>
+  <title>libmcs-&libmcs-version;</title>
+
+  <indexterm zone="libmcs">
+    <primary sortas="a-libmcs">mcs</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to mcs</title>
-
-    <para>The <application>mcs</application> package is a library and set of
+    <title>Introduction to libmcs</title>
+
+    <para>The <application>libmcs</application> package is a library and set of
     tools which abstract the storage of configuration settings away from
     userland applications. There are similar projects like this (such as
     <application>GConf</application>), but unlike those projects,
-    <application>mcs</application> strictly handles abstraction. It does not
+    <application>libmcs</application> strictly handles abstraction. It does not
     impose any specific data storage requirement, nor is it tied to any
     desktop environment or software suite.</para>
@@ -41,27 +41,27 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&mcs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&mcs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &mcs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &mcs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &mcs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &mcs-time;</para>
+        <para>Download (HTTP): <ulink url="&libmcs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libmcs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libmcs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libmcs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libmcs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libmcs-time;</para>
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">mcs Dependencies</bridgehead>
+    <bridgehead renderas="sect3">libmcs Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="Mowgli"/></para>
+    <para role="required"><xref linkend="libmowgli"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -75,7 +75,7 @@
 
   <sect2 role="installation">
-    <title>Installation of mcs</title>
-
-    <para>Install <application>mcs</application> by
+    <title>Installation of libmcs</title>
+
+    <para>Install <application>libmcs</application> by
     running the following commands:</para>
 
@@ -88,5 +88,5 @@
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m644 -D README /usr/share/doc/mcs-&mcs-version;/README</userinput></screen>
+install -v -m644 -D README /usr/share/doc/libmcs-&libmcs-version;/README</userinput></screen>
 
   </sect2>
@@ -101,4 +101,10 @@
     headers.</para>
 
+    <para><option>--disable-kconfig</option>: If <filename>configure</filename>
+    finds <filename class="libraryfile">libkdecore</filename> from
+    <application>kdelibs</application>, it does not test to check it is indeed
+    the <application>kde3</application> version and will try to use it (and
+    fail). This switch will prevent that.</para>
+
     <para>For additional information about the various storage backends
     (including the default XDG-compliant backend), see the
@@ -108,7 +114,7 @@
 
   <sect2 role="configuration">
-    <title>Configuring mcs</title>
-
-    <para>There are various ways to configure <application>mcs</application>
+    <title>Configuring libmcs</title>
+
+    <para>There are various ways to configure <application>libmcs</application>
     to use a specific backend on a site-wide or individual user basis. If the
     default file-based storage backend is suitable, no configuration steps are
@@ -130,6 +136,6 @@
         mcs-setconfval</seg>
         <seg>libmcs.so and backend storage modules</seg>
-        <seg>/usr/include/mcs, /usr/lib/mcs and
-        /usr/share/doc/mcs-&mcs-version;</seg>
+        <seg>/usr/include/libmcs, /usr/lib/mcs and
+        /usr/share/doc/libmcs-&libmcs-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -143,7 +149,7 @@
         <term><command>mcs-getconfval</command></term>
         <listitem>
-          <para>queries <application>mcs</application> for a configuration
+          <para>queries <application>libmcs</application> for a configuration
           value.</para>
-          <indexterm zone="mcs mcs-getconfval">
+          <indexterm zone="libmcs mcs-getconfval">
             <primary sortas="b-mcs-getconfval">mcs-getconfval</primary>
           </indexterm>
@@ -155,6 +161,6 @@
         <listitem>
           <para>displays information about the current installation and
-          configuration of <application>mcs</application>.</para>
-          <indexterm zone="mcs mcs-info">
+          configuration of <application>libmcs</application>.</para>
+          <indexterm zone="libmcs mcs-info">
             <primary sortas="b-mcs-info">mcs-info</primary>
           </indexterm>
@@ -165,7 +171,7 @@
         <term><command>mcs-query-backends</command></term>
         <listitem>
-          <para>queries <application>mcs</application> to determine what
+          <para>queries <application>libmcs</application> to determine what
           backends are available.</para>
-          <indexterm zone="mcs mcs-query-backends">
+          <indexterm zone="libmcs mcs-query-backends">
             <primary sortas="b-mcs-query-backends">mcs-query-backends</primary>
           </indexterm>
@@ -176,7 +182,7 @@
         <term><command>mcs-setconfval</command></term>
         <listitem>
-          <para>instructs <application>mcs</application> to change a
+          <para>instructs <application>libmcs</application> to change a
           configuration value.</para>
-          <indexterm zone="mcs mcs-setconfval">
+          <indexterm zone="libmcs mcs-setconfval">
             <primary sortas="b-mcs-setconfval">mcs-setconfval</primary>
           </indexterm>
@@ -184,10 +190,10 @@
       </varlistentry>
 
-      <varlistentry id="libmcs">
+      <varlistentry id="libmcs.so">
         <term><filename class='libraryfile'>libmcs.so</filename></term>
         <listitem>
           <para>contains the API functions required by the
-          <application>mcs</application> userspace tools.</para>
-          <indexterm zone="mcs libmcs">
+          <application>libmcs</application> userspace tools.</para>
+          <indexterm zone="libmcs libmcs.so">
             <primary sortas="c-libmcs.so">libmcs.so</primary>
           </indexterm>
Index: general/genlib/mowgli.xml
===================================================================
--- general/genlib/mowgli.xml	(revision 48d0ea5b032d8f00abed240fd76753f89c455c7c)
+++ general/genlib/mowgli.xml	(revision e8ec9467e97011cf257d5e3345b95e1c01abddbd)
@@ -5,13 +5,13 @@
   %general-entities;
 
-<!ENTITY Mowgli-download-http "http://distfiles.atheme.org/libmowgli-&Mowgli-version;.tgz">
-<!ENTITY Mowgli-download-ftp " ">
-<!ENTITY Mowgli-md5sum "80f8a27f1b44b0b129215f858ab1ab82">
-<!ENTITY Mowgli-size "106 KB">
-<!ENTITY Mowgli-buildsize "2.0 MB">
-<!ENTITY Mowgli-time "less than 0.1 SBU">
+<!ENTITY libmowgli-download-http "http://distfiles.atheme.org/libmowgli-&libmowgli-version;.tgz">
+<!ENTITY libmowgli-download-ftp " ">
+<!ENTITY libmowgli-md5sum "402c2de0da7f83f5e3390397ad994b20">
+<!ENTITY libmowgli-size "113 KB">
+<!ENTITY libmowgli-buildsize "1.9 MB">
+<!ENTITY libmowgli-time "less than 0.1 SBU">
 ]>
 
-<sect1 id="Mowgli" xreflabel="Mowgli-&Mowgli-version;">
+<sect1 id="libmowgli" xreflabel="libmowgli-&libmowgli-version;">
   <?dbhtml filename="Mowgli.html"?>
 
@@ -21,14 +21,14 @@
   </sect1info>
 
-  <title>Mowgli-&Mowgli-version;</title>
+  <title>libmowgli-&libmowgli-version;</title>
 
-  <indexterm zone="Mowgli">
-    <primary sortas="a-Mowgli">Mowgli</primary>
+  <indexterm zone="libmowgli">
+    <primary sortas="a-libmowgli">Libmowgli</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Mowgli</title>
+    <title>Introduction to libmowgli</title>
 
-    <para>The <application>Mowgli</application> package contains a
+    <para>The <application>libmowgli</application> package contains a
     development framework for C, similar to <xref linkend="glib2"/>. It
     provides high performance and highly flexible algorithms for routine
@@ -39,20 +39,20 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&Mowgli-download-http;"/></para>
+        <para>Download (HTTP): <ulink url="&libmowgli-download-http;"/></para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&Mowgli-download-ftp;"/></para>
+        <para>Download (FTP): <ulink url="&libmowgli-download-ftp;"/></para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &Mowgli-md5sum;</para>
+        <para>Download MD5 sum: &libmowgli-md5sum;</para>
       </listitem>
       <listitem>
-        <para>Download size: &Mowgli-size;</para>
+        <para>Download size: &libmowgli-size;</para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &Mowgli-buildsize;</para>
+        <para>Estimated disk space required: &libmowgli-buildsize;</para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &Mowgli-time;</para>
+        <para>Estimated build time: &libmowgli-time;</para>
       </listitem>
     </itemizedlist>
@@ -64,7 +64,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Mowgli</title>
+    <title>Installation of libmowgli</title>
 
-    <para>Install <application>Mowgli</application> by running the following
+    <para>Install <application>libmowgli</application> by running the following
     commands:</para>
 
@@ -100,11 +100,11 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="libmowgli">
+      <varlistentry id="libmowgli.so">
         <term><filename class='libraryfile'>libmowgli.so</filename></term>
         <listitem>
           <para>libraries contain optimized functions for various common
           C programming tasks.</para>
-          <indexterm zone="Mowgli libmowgli">
-            <primary sortas="c-libmowgli">libmowgli.{so,a}</primary>
+          <indexterm zone="libmowgli">
+            <primary sortas="c-libmowgli">libmowgli.so</primary>
           </indexterm>
         </listitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 48d0ea5b032d8f00abed240fd76753f89c455c7c)
+++ introduction/welcome/changelog.xml	(revision e8ec9467e97011cf257d5e3345b95e1c01abddbd)
@@ -47,4 +47,8 @@
           <para>[ken] - Update to libglade-2.6.3.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Update to audacious-1.5.1 with audacious-plugins-1.5.1,
+          libmowgli-0.7.0 and libmcs-0.7.1.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision 48d0ea5b032d8f00abed240fd76753f89c455c7c)
+++ multimedia/audioutils/audacious.xml	(revision e8ec9467e97011cf257d5e3345b95e1c01abddbd)
@@ -5,20 +5,17 @@
   %general-entities;
 
-  <!ENTITY audacious-download-http        "http://distfiles.atheme.org/audacious-&audacious-version;.tgz">
-  <!ENTITY audacious-download-ftp         "&gentoo-ftp-repo;/audacious-&audacious-version;.tgz">
-  <!ENTITY audacious-md5sum               "b784a30604a2f9d84e9da310069f43f9">
-  <!ENTITY audacious-size                 "1.7 MB">
-  <!ENTITY audacious-buildsize            "86 MB (includes all plugins and documentation)">
-  <!ENTITY audacious-time                 "1.9 SBU">
-
-  <!ENTITY audacious-plugins-version       "1.3.5">
-  <!ENTITY audacious-plugins-download      "http://distfiles.atheme.org/audacious-plugins-&audacious-plugins-version;.tgz">
-  <!ENTITY audacious-plugins-md5sum        "ff6b5901367337f8149e15c8fb1fdf95">
-  <!ENTITY audacious-plugins-size          "2.9 MB">
-
-  <!ENTITY audacious-plugins-ugly-version  "1.3.0">
-  <!ENTITY audacious-plugins-ugly-download "http://distfiles.atheme.org/audacious-plugins-ugly-&audacious-plugins-ugly-version;.tgz">
-  <!ENTITY audacious-plugins-ugly-md5sum   "3c6274c334c60e092135202a37c61dc2">
-  <!ENTITY audacious-plugins-ugly-size     "438 KB">
+  <!ENTITY audacious-download-http        "http://distfiles.atheme.org/audacious-&audacious-version;.tbz2">
+  <!--<!ENTITY audacious-download-ftp         "&gentoo-ftp-repo;/audacious-&audacious-version;.tbz2">-->
+  <!ENTITY audacious-download-ftp         " ">
+  <!ENTITY audacious-md5sum               "ea7a8ee2e8f1a301b40ccf40788ab0eb">
+  <!ENTITY audacious-size                 "1.3 MB">
+  <!ENTITY audacious-buildsize            "81 MB (typical)">
+  <!ENTITY audacious-time                 "2.3 SBU">
+
+  <!ENTITY audacious-plugins-version       "1.5.1">
+  <!ENTITY audacious-plugins-download      "http://distfiles.atheme.org/audacious-plugins-&audacious-plugins-version;.tbz2">
+  <!ENTITY audacious-plugins-md5sum        "b237754a615cf9a3d77a93bf18de26fc">
+  <!ENTITY audacious-plugins-size          "2.1 MB">
+
 ]>
 
@@ -79,21 +76,9 @@
     </itemizedlist>
 
-    <itemizedlist spacing="compact">
-    <title>Optional</title>
-      <listitem>
-        <para>Ugly Plugins: <ulink url="&audacious-plugins-ugly-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Md5 sum: &audacious-plugins-ugly-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Size: &audacious-plugins-ugly-size;</para>
-      </listitem>
-    </itemizedlist>
-
+    <!-- 404
     <para>Additional plugins can be downloaded from <ulink
     url="http://audacious-media-player.org/index.php?title=Plugins"/>.
     Note that these third-party plugins are not supported by the
-    <application>Audacious</application> development team.</para>
+    <application>Audacious</application> development team.</para> -->
 
     <bridgehead renderas="sect3">Audacious Dependencies</bridgehead>
@@ -101,5 +86,8 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required"><xref linkend="libglade"/> and
-    <xref linkend="mcs"/></para>
+    <xref linkend="libmcs"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="optional"><xref linkend="dbus"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -107,5 +95,6 @@
     <ulink url="http://www.geocities.jp/kosako3/oniguruma/">Oniguruma</ulink>,
     <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit Code</ulink>
-      (a.k.a. libsamplerate), and
+      (a.k.a. libsamplerate),
+    <xref linkend="doxygen"/>, and
     <xref linkend="gtk-doc"/></para>
 
@@ -115,4 +104,5 @@
     <xref linkend="alsa"/>,
     <xref linkend="arts"/>,
+    <ulink url="http://www.gnu.org/software/libcdio/">libcdio</ulink>,
     <xref linkend="curl"/>,
     <xref linkend="esound"/>,
@@ -125,4 +115,5 @@
     <xref linkend="libvorbis"/>,
     <ulink url="http://www.lirc.org">LIRC</ulink>,
+    <ulink url="http://www.webdav.org/neon/">neon-0.28.3</ulink> for online mpg3 and ogg radio,
     <ulink url="http://xmms-projectm.sourceforge.net/">projectM</ulink>,
     <ulink url="http://pulseaudio.org/">PulseAudio</ulink>,
@@ -149,6 +140,7 @@
 make</userinput></screen>
 
+    <!-- target no longer present
     <para>If you wish to create the SDK documentation, issue the following
-    command: <command>make documentation-build</command>.</para>
+    command: <command>make documentation-build</command>.</para> -->
 
     <para>This package does not come with a test suite.</para>
@@ -159,4 +151,5 @@
 install -v -m644 -D README /usr/share/doc/audacious-&audacious-version;/README</userinput></screen>
 
+    <!--
     <para>If you created the SDK documentation, install it by issuing the
     following commands as the <systemitem class="username">root</systemitem>
@@ -167,5 +160,5 @@
                     /usr/share/gtk-doc/html/audacious &amp;&amp;
 install -v -m644    doc/libaudacious/html/* \
-                    /usr/share/gtk-doc/html/libaudacious</userinput></screen>
+                    /usr/share/gtk-doc/html/libaudacious</userinput></screen> -->
 
   </sect2>
@@ -202,7 +195,4 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
-
-    <para>If desired, repeat this procedure for the optional plugins
-    package.</para>
 
   </sect2>
@@ -221,6 +211,6 @@
         Output, Visualization, and amidi-plug plugin modules</seg>
         <seg>/usr/include/audacious, /usr/lib/audacious,
-        /usr/share/audacious, /usr/share/doc/audacious-&audacious-version;,
-        and /usr/share/gtk-doc/html/audacious</seg>
+        /usr/share/audacious, /usr/share/doc/audacious-&audacious-version;
+        <!-- and /usr/share/gtk-doc/html/audacious --></seg>
       </seglistitem>
     </segmentedlist>
