Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0f9a8a99805251134c6075ecee427059f80fb983)
+++ introduction/welcome/changelog.xml	(revision abba1adccdadb9568d51462797f49a5e3a884169)
@@ -46,6 +46,11 @@
       <itemizedlist>
         <listitem>
-          <para>[randy] - Updated all the links to files on the Anduin server
-          to use entities.</para>
+          <para>[randy] - Added instructions to build the Akode package, added
+          a patch to fix a build issue with libtunepimp, and adjusted the
+          dependencies in the Kdemultimedia instructions.</para>
+        </listitem>
+        <listitem>
+          <para>[randy] - Updated all the links to files located on the Anduin
+          server to use entities.</para>
         </listitem>
         <listitem>
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 0f9a8a99805251134c6075ecee427059f80fb983)
+++ kde/add/kdemultimedia.xml	(revision abba1adccdadb9568d51462797f49a5e3a884169)
@@ -11,4 +11,12 @@
   <!ENTITY kdemultimedia-buildsize     "114 MB">
   <!ENTITY kdemultimedia-time          "8.8 SBU">
+
+  <!ENTITY akode-version       "svn_060128">
+  <!ENTITY akode-download-http "&sources-anduin-http;/a/akode-&akode-version;.tar.bz2">
+  <!ENTITY akode-download-ftp  "&sources-anduin-ftp;/a/akode-&akode-version;.tar.bz2">
+  <!ENTITY akode-md5sum        "7ea67354104ca421bb269cae4df3f5bd">
+  <!ENTITY akode-size          "493 KB">
+  <!ENTITY akode-buildsize     "12.1 MB">
+  <!ENTITY akode-time          "0.4 SBU">
 ]>
 
@@ -34,5 +42,5 @@
     <title>Introduction to Kdemultimedia</title>
 
-    <para><application>Kdemultimedia</application> provides serveral
+    <para><application>Kdemultimedia</application> provides several
     <application>KDE</application> programs to work with sound.  Programs
     include applications for a Jukebox, a soundcard mixer, a midi and karaoke
@@ -40,7 +48,115 @@
     <application>aRts</application>.</para>
 
+    <para>In this version of <application>Kdemultimedia</application>, some
+    of the functionality provided by the package has been moved off into a
+    separate project named <application>Akode</application>. In order for
+    <application>Kdemultimedia</application> to provide the removed
+    functionality, you must install the <application>Akode</application>
+    package first. Instructions to install <application>Akode</application>
+    follow. If you wish to skip the <application>Akode</application>
+    installation, go straight to the
+    <xref linkend="kdemultimedia-instructions"/>.</para>
+
+  </sect2>
+
+  <sect2 role="package" id="akode" xreflabel="Akode-&akode-version;">
+    <title>Akode-&akode-version;</title>
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
+        <para>Download (HTTP): <ulink url="&akode-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&akode-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &akode-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &akode-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &akode-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &akode-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Downloading the SVN Sources</bridgehead>
+
+    <para>If you have <xref linkend="subversion"/> installed and you wish to
+    download the sources straight from the KDE respository, issue the following
+    commands to check out a copy of <application>Akode</application>:</para>
+
+<screen><userinput>export PACKAGE_VERSION="svn-$(date +%y%m%d)" &amp;&amp;
+
+svn -N co \
+    svn://anonsvn.kde.org/home/kde/trunk/kdesupport \
+    akode-$PACKAGE_VERSION &amp;&amp;
+svn    co \
+    svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akode \
+    akode-$PACKAGE_VERSION/akode &amp;&amp;
+svn    co \
+    svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin \
+    akode-$PACKAGE_VERSION/admin</userinput></screen>
+
+    <para>If you wish to create a tarball of the files you just downloaded,
+    issue the following commands:</para>
+
+<screen><userinput>tar cf akode-$PACKAGE_VERSION.tar akode-$PACKAGE_VERSION
+bzip2 akode-$PACKAGE_VERSION.tar</userinput></screen>
+
+    <bridgehead renderas="sect3">Akode Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="pkgconfig"/>,
+    <xref linkend="flac"/>,
+    <xref linkend="speex"/>,
+    <xref linkend="libmad"/>,
+    <xref linkend="alsa"/>,
+    <xref linkend="libvorbis"/>,
+    <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit
+    Code</ulink> (a.k.a. libsamplerate),
+    <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>,
+    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>, and
+    <ulink url="http://www.mplayerhq.hu/homepage/design7/dload.html#cvs">FFmpeg
+    </ulink>(must be a CVS version, and support is experimental)</para>
+
+    <bridgehead renderas="sect3">Installation of Akode</bridgehead>
+
+    <para>Install <application>Akode</application> by issuing the following
+    commands:</para>
+
+<screen><userinput>make -f Makefile.cvs &amp;&amp;
+./configure --prefix=&kde-dir; \
+    --disable-debug --disable-dependency-tracking &amp;&amp;
+make</userinput></screen>
+
+      <para>This package does not come with a test suite.</para>
+
+      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  <para>The <command>make -f Makefile.cvs</command> command is used to create
+  the autotools files. The tarball was created by checking out the sources from
+  the KDE SVN repository and includes an
+  <filename class='directory'>admin</filename> directory containing an
+  additional <filename>Makefile</filename>, shell scripts and other support
+  files used to create the autotools files. Running this command
+  does everything required to essentially create a distribution directory ready
+  to use for package installation.</para>
+
+  </sect2>
+
+  <sect2 id="kdemultimedia-instructions"
+         xreflabel="Kdemultimedia Instructions">
+    <title>Resuming the Kdemultimedia Instructions</title>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
         <para>Download (HTTP): <ulink url="&kdemultimedia-download-http;"/></para>
       </listitem>
@@ -59,4 +175,13 @@
       <listitem>
         <para>Estimated build time: &kdemultimedia-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch (if <application>libtunepimp</application>
+        &gt;= 0.4.x is installed): <ulink
+        url="&patch-root;/kdemultimedia-&kde-version;-libtunepimp_0.4.x-1.patch"/></para>
       </listitem>
     </itemizedlist>
@@ -69,27 +194,32 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended"><xref linkend="libjpeg"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="alsa"/>, and
-    <xref linkend="libmad"/></para>
+    <xref linkend="libxml2"/>, and
+    <xref linkend="alsa"/></para>
+    <!-- <xref linkend="libmad"/> moved to Akode -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="cdparanoia"/>,
+    <para role="optional"><xref linkend="akode"/>,
+    <xref linkend="cdparanoia"/>,
     <xref linkend="lame"/>,
     <xref linkend="audiofile"/>,
-    <xref linkend="libogg"/>,
     <xref linkend="libvorbis"/>,
     <xref linkend="xine-lib"/>,
-    <xref linkend="flac"/>,
-    <xref linkend="speex"/>,
-    <xref linkend="sdl"/>,
-    <xref linkend="libmusicbrainz"/>,
-    <xref linkend="gstreamer"/>
-    (with <ulink url="http://developer.kde.org/~wheeler/juk.html">KGst</ulink>),
-    <ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>,
-    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>,
-    <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>,
-    <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit Code</ulink>,
-    <ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM Generator</ulink>, and
-    <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink></para>
+    <xref linkend="flac"/> (built with <xref linkend="libogg"/> support),
+    <xref linkend="gstreamer"/>,
+    <ulink url="http://www.theora.org/">Theora</ulink>,
+    <ulink url="http://developer.kde.org/~wheeler/taglib/">TagLib</ulink>, and
+    <ulink url="http://www.musicbrainz.org/products/tunepimp/download.html">TunePimp</ulink>
+    (requires <xref linkend="libmusicbrainz"/>)</para>
+    <!-- moved to Akode
+    <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>
+    <ulink url="http://www.mega-nerd.com/libsamplerate/">Secret Rabbit Code</ulink>
+    <ulink url="http://jackit.sourceforge.net/">JACK</ulink>
+    <xref linkend="speex"/>, moved to Akode
+    -->
+    <!-- <xref linkend="sdl"/>, not used any longer -->
+    <!-- <xref linkend="libogg"/>, no good without vorbis, so is redundant -->
+    <!-- Uses internal copy now
+    <ulink url="http://www.musicbrainz.org/products/trmgen/download.html">TRM Generator</ulink>
+    -->
 
   </sect2>
@@ -105,5 +235,6 @@
     </note>
 
-<screen><userinput>./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
+<screen><userinput>patch -Np1 -i ../kdemultimedia-&kde-version;-libtunepimp_0.4.x-1.patch &amp;&amp;
+./configure --prefix=&kde-dir; --sysconfdir=/etc/kde \
     --disable-debug --disable-dependency-tracking &amp;&amp;
 make</userinput></screen>
@@ -124,7 +255,12 @@
 
       <seglistitem>
-        <seg>artsbuilder, juk, kaboodle, kmid, kmix, krec, kscd, and noatun</seg>
+        <seg>artsbuilder, artscontrol, juk, kaboodle, kaudiocreator, kmid,
+        kmix, kmixctrl, krec, kscd, midisend, mpeglibartsplay, noatun,
+        workman2cddb.pl, yaf-cdda, yaf-mpgplay, yaf-splay, yaf-tplay,
+        yaf-vorbis, and yaf-yuv</seg>
         <seg>Numerous kdemultimedia specific libraries</seg>
-        <seg>Several subdirectories of $KDE_PREFIX/{include,share}</seg>
+        <seg>The following subdirectories in $KDE_PREFIX: include/[libkcddb,
+        mpeglib, noatun], lib/mcop/Noatun, and
+        share/apps/[too many to list]</seg>
       </seglistitem>
     </segmentedlist>
