diff --git a/multimedia/libdriv/gstreamer.xml b/multimedia/libdriv/gstreamer.xml
index a6302938dc..e2657b8c01 100644
--- a/multimedia/libdriv/gstreamer.xml
+++ b/multimedia/libdriv/gstreamer.xml
@@ -58,7 +58,7 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">GStreamer Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="glib2"/>, 
diff --git a/multimedia/libdriv/id3lib.xml b/multimedia/libdriv/id3lib.xml
index f3b06065d1..562dde0a1b 100644
--- a/multimedia/libdriv/id3lib.xml
+++ b/multimedia/libdriv/id3lib.xml
@@ -1,3 +1,4 @@
+<?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" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
@@ -12,116 +13,140 @@
 ]>
 
 <sect1 id="id3lib" xreflabel="id3lib-&id3lib-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="id3lib.html"?>
-<title>id3lib-&id3lib-version;</title>
-<indexterm zone="id3lib">
-<primary sortas="a-Id3lib">Id3lib</primary></indexterm>
+  <?dbhtml filename="id3lib.html"?>
 
-<sect2>
-<title>Introduction to <application>id3lib</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para><application>id3lib</application> is a library for reading, writing and 
-manipulating ID3v1 and ID3v2 tags.</para>
+  <title>Id3lib-&id3lib-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&id3lib-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&id3lib-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &id3lib-md5sum;</para></listitem>
-<listitem><para>Download size: &id3lib-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&id3lib-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&id3lib-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="id3lib">
+    <primary sortas="a-Id3lib">Id3lib</primary>
+  </indexterm>
 
-</sect2>
+  <sect2 role="package">
+    <title>Introduction to Id3lib</title>
 
-<sect2>
-<title>Installation of <application>id3lib</application></title>
+    <para><application>id3lib</application> is a library for reading, 
+    writing and manipulating ID3v1 and ID3v2 tags.</para>
 
-<para>Install <application>id3lib</application> by running the
-following commands:</para>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&id3lib-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&id3lib-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &id3lib-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &id3lib-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &id3lib-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &id3lib-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+  </sect2>
 
-<para>Now, as the root user:</para>
+  <sect2 role="installation">
+    <title>Installation of Id3lib</title>
 
-<screen><userinput role='root'><command>make install &amp;&amp;
+    <para>Install <application>id3lib</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
 install -v -m755 -d /usr/share/doc/id3lib-&id3lib-version; &amp;&amp;
 install -v -m644 doc/*.{gif,jpg,png,ico,css,txt,php,html} \
-    /usr/share/doc/id3lib-&id3lib-version;</command></userinput></screen>
+    /usr/share/doc/id3lib-&id3lib-version;</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Library</segtitle>
-<segtitle>Installed Directories</segtitle>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<seglistitem>
-<seg>id3convert, id3cp, id3info and id3tag</seg>
-<seg>libid3.[so,a]</seg>
-<seg>/usr/include/id3 and /usr/share/doc/id3lib-3.8.3</seg>
-</seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>id3convert, id3cp, id3info, and id3tag</seg>
+        <seg>libid3.[so,a]</seg>
+        <seg>/usr/include/id3 and /usr/share/doc/id3lib-3.8.3</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="id3convert">
-<term><command>id3convert</command></term>
-<listitem><para>converts between ID3v1/v2 tagging formats.</para>
-<indexterm zone="id3lib id3convert">
-<primary sortas="b-id3convert">id3convert</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="id3convert">
+        <term><command>id3convert</command></term>
+        <listitem>
+          <para>converts between ID3v1/v2 tagging formats.</para>
+          <indexterm zone="id3lib id3convert">
+            <primary sortas="b-id3convert">id3convert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="id3cp">
-<term><command>id3cp</command></term>
-<listitem><para>extracts ID3v1/v2 tags from digital audio files.</para>
-<indexterm zone="id3lib id3cp">
-<primary sortas="b-id3cp">id3cp</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="id3cp">
+        <term><command>id3cp</command></term>
+        <listitem>
+          <para>extracts ID3v1/v2 tags from digital audio files.</para>
+          <indexterm zone="id3lib id3cp">
+            <primary sortas="b-id3cp">id3cp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="id3info">
-<term><command>id3info</command></term>
-<listitem><para>prints ID3v1/v2 tag contents.</para>
-<indexterm zone="id3lib id3info">
-<primary sortas="b-id3info">id3info</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="id3info">
+        <term><command>id3info</command></term>
+        <listitem>
+          <para>prints ID3v1/v2 tag contents.</para>
+          <indexterm zone="id3lib id3info">
+            <primary sortas="b-id3info">id3info</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="id3tag">
-<term><command>id3tag</command></term>
-<listitem><para>is an utility for editing ID3v1/v2 tags.</para>
-<indexterm zone="id3lib id3tag">
-<primary sortas="b-id3tag">id3tag</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="id3tag">
+        <term><command>id3tag</command></term>
+        <listitem>
+          <para>is an utility for editing ID3v1/v2 tags.</para>
+          <indexterm zone="id3lib id3tag">
+            <primary sortas="b-id3tag">id3tag</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="libid3">
-<term><filename class='libraryfile'>libid3.[so,a]</filename></term>
-<listitem><para>provides functions for the ID3v1/v2 tag editing 
-programs as well as other external programs and libraries.</para>
-<indexterm zone="id3lib libid3">
-<primary sortas="c-libid3">libid3.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="libid3">
+        <term><filename class='libraryfile'>libid3.[so,a]</filename></term>
+        <listitem>
+          <para>provides functions for the ID3v1/v2 tag editing 
+          programs as well as other external programs and libraries.</para>
+          <indexterm zone="id3lib libid3">
+            <primary sortas="c-libid3">libid3.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>