Index: multimedia/libdriv/libmad.xml
===================================================================
--- multimedia/libdriv/libmad.xml	(revision e20bc0e5394a2dbafe06842c8debc41983f2a861)
+++ multimedia/libdriv/libmad.xml	(revision ab10474b7d980434e669dbd197838dfa94368448)
@@ -1,2 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -13,61 +14,87 @@
 
 <sect1 id="libmad" xreflabel="libmad-&libmad-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libmad.html"?>
-<title>libmad-&libmad-version;</title>
+  <?dbhtml filename="libmad.html"?>
 
-<sect2>
-<title>Introduction to <application>libmad</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>
-<application>libmad</application> is a high-quality
-<acronym>MPEG</acronym> audio decoder capable of 24-bit output.</para>
+  <title>Libmad-&libmad-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&libmad-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&libmad-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &libmad-md5sum;</para></listitem>
-<listitem><para>Download size: &libmad-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&libmad-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&libmad-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="libmad">
+    <primary sortas="a-Libmad">Libmad</primary>
+  </indexterm>
 
-</sect2>
+  <sect2 role="package">
+    <title>Introduction to Libmad</title>
 
-<sect2>
-<title>Installation of <application>libmad</application></title>
+    <para><application>libmad</application> is a high-quality
+    MPEG audio decoder capable of 24-bit output.</para>
 
-<para>Install <application>libmad</application> by running the
-following commands:</para>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libmad-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libmad-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libmad-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libmad-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libmad-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libmad-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libmad</title>
+
+    <para>Install <application>libmad</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen>
+make install</userinput></screen>
 
-</sect2>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<sect2>
-<title>Contents</title>
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libmad.[so,a]</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>This package provides
-<filename class="libraryfile">libmad</filename> library.</para>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="libmad-lib">
+        <term><filename class='libraryfile'>libmad.[so,a]</filename></term>
+        <listitem>
+          <para>is a MPEG audio decoder library.</para>
+          <indexterm zone="libmad libmad-lib">
+            <primary sortas="c-libmad">libmad.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect2><title>Description</title>
+    </variablelist>
 
-<sect3><title>libmad</title>
-<para><filename class="libraryfile">libmad</filename> 
-is a <acronym>MPEG</acronym> audio decoder library.</para></sect3>
-
-</sect2>
+  </sect2>
 
 </sect1>
