Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision da4fa3a603a8e7c1d92c8fd34ff9c16c1836dfad)
+++ kde/add/kdeaddons.xml	(revision 038ee3d21c21203ff686f36cc6c3fbe289125623)
@@ -53,5 +53,5 @@
 <xref linkend="kdegames"/>, 
 <xref linkend="db"/>, 
-<xref linkend="xmms"/> and 
+<xref linkend="xmms-package"/> and 
 <xref linkend="sdl"/></para>
 </sect4>
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision da4fa3a603a8e7c1d92c8fd34ff9c16c1836dfad)
+++ kde/add/kdenetwork.xml	(revision 038ee3d21c21203ff686f36cc6c3fbe289125623)
@@ -52,5 +52,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="ppp"/>, 
-<xref linkend="xmms"/>, 
+<xref linkend="xmms-package"/>, 
 <ulink url="http://www.openslp.org/">OpenSLP</ulink>, 
 <ulink 
Index: multimedia/audioutils/xmms.xml
===================================================================
--- multimedia/audioutils/xmms.xml	(revision da4fa3a603a8e7c1d92c8fd34ff9c16c1836dfad)
+++ multimedia/audioutils/xmms.xml	(revision 038ee3d21c21203ff686f36cc6c3fbe289125623)
@@ -11,5 +11,5 @@
 ]>
 
-<sect1 id="xmms" xreflabel="XMMS-&XMMS-version;">
+<sect1 id="xmms-package" xreflabel="XMMS-&XMMS-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,4 +18,6 @@
 <?dbhtml filename="xmms.html"?>
 <title>XMMS-&XMMS-version;</title>
+<indexterm zone="xmms-package">
+<primary sortas="a-XMMS">XMMS</primary></indexterm>
 
 <sect2>
@@ -44,4 +46,5 @@
 <para><xref linkend="GTK"/></para>
 </sect4>
+
 <sect4><title>Optional</title>
 <para><xref linkend="alsa"/>, 
@@ -63,6 +66,9 @@
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 </sect2>
 
@@ -70,6 +76,9 @@
 <title>Configuring <application><acronym>XMMS</acronym></application></title>
 
-<sect3><title>Config files</title>
+<sect3 id="xmms-config-config"><title>Config files</title>
 <para><filename>~/.xmms/config</filename></para>
+<indexterm zone="xmms-package xmms-config-config">
+<primary sortas="e-AA.xmms-config">~/.xmms/config</primary>
+</indexterm>
 </sect3>
 
@@ -87,31 +96,64 @@
 <title>Contents</title>
 
-<para>The <application><acronym>XMMS</acronym></application> package contains 
-<command>xmms</command>, 
-<command>xmms-config</command> and 
-<command>wmxmms.</command></para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>xmms, xmms-config and wmxmms</seg>
+<seg>libxmms.[so,a] and numerous input, output, effects and general 
+plugins</seg>
+<seg>/usr/include/xmms, /usr/lib/xmms and /usr/share/xmms</seg>
+</seglistitem>
+</segmentedlist>
+
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="xmms">
+<term><command>xmms</command></term>
+<listitem><para> (an acronym for X MultiMedia System) is a program comparable 
+in function with <application>WinAMP</application>. Its main function is 
+playing audio files like <filename>WAV</filename> and 
+<filename>MP3</filename>. It can be extended with plugins to play a number of 
+other audio or video formats. Its look can be customized with 
+<application>WinAMP</application> style skins.</para>
+<indexterm zone="xmms-package xmms">
+<primary sortas="b-xmms">xmms</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="xmms-config">
+<term><command>xmms-config</command></term>
+<listitem><para>is used by other programs which need to link with 
+<command>xmms</command> to retrieve the library and include paths.</para>
+<indexterm zone="xmms-package xmms-config">
+<primary sortas="b-xmms-config">xmms-config</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="wmxmms">
+<term><command>wmxmms</command></term>
+<listitem><para>is a dock applet for the 
+<application>Window Maker</application> window manager. From the applet you 
+can start and control <command>xmms</command>.</para>
+<indexterm zone="xmms-package wmxmms">
+<primary sortas="b-wmxmms">wmxmms</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="libxmms">
+<term><filename class='libraryfile'>libxmms.[so,a]</filename></term>
+<listitem><para>contains graphics and playback functions used by 
+<command>xmms</command>. These functions can also be utilized by other 
+packages.</para>
+<indexterm zone="xmms-package libxmms">
+<primary sortas="c-libxmms">libxmms.[so,a]</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
-<sect2><title>Description</title>
-
-<sect3><title>xmms</title>
-<para><acronym>XMMS</acronym>, which stands for X MultiMedia System, is a 
-program comparable in function with <application>WinAMP</application>. Its 
-main function is playing audio files like <filename>WAV</filename> and 
-<filename>MP3</filename>. It can be extended with plugins to play a number of 
-other audio or video formats. Its look can be customized with 
-<application>WinAMP</application> style skins.</para></sect3>
-
-<sect3><title>xmms-config</title>
-<para>This script is used by other programs which need to link with 
-<command>xmms</command> to retrieve the library and include 
-paths.</para></sect3>
-
-<sect3><title>wmxmms</title>
-<para><command>wmxmms</command> is a dock applet for the 
-<application>Window Maker</application> window manager. From the applet you 
-can start and control <command>xmms</command>.</para></sect3>
-</sect2>
-
 </sect1>
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision da4fa3a603a8e7c1d92c8fd34ff9c16c1836dfad)
+++ multimedia/libdriv/flac.xml	(revision 038ee3d21c21203ff686f36cc6c3fbe289125623)
@@ -41,5 +41,5 @@
 <sect4><title>Optional</title>
 <para><xref linkend="libogg"/>, 
-<xref linkend="xmms"/>, 
+<xref linkend="xmms-package"/>, 
 <xref linkend="NASM"/>, 
 <xref linkend="docbook-utils"/>, 
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision da4fa3a603a8e7c1d92c8fd34ff9c16c1836dfad)
+++ multimedia/videoutils/mplayer.xml	(revision 038ee3d21c21203ff686f36cc6c3fbe289125623)
@@ -107,5 +107,5 @@
 <xref linkend="nas"/>, 
 <xref linkend="sdl"/> (also used for video output), 
-<xref linkend="xmms"/>, 
+<xref linkend="xmms-package"/>, 
 <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink>, 
 <ulink url="http://bio2jack.sourceforge.net/">bio2jack</ulink> (requires 
