diff --git a/multimedia/libdriv/libvorbis.xml b/multimedia/libdriv/libvorbis.xml
index 5e25c2b521..9f2f44d61f 100644
--- a/multimedia/libdriv/libvorbis.xml
+++ b/multimedia/libdriv/libvorbis.xml
@@ -18,6 +18,8 @@
 </sect1info>
 <?dbhtml filename="libvorbis.html"?>
 <title>libvorbis-&libvorbis-version;</title>
+<indexterm zone="libvorbis">
+<primary sortas="a-Libvorbis">Libvorbis</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>libvorbis</application></title>
@@ -64,17 +66,13 @@ commands:</para>
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make</command></userinput></screen>
 
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
 <para><application>libvorbis</application> is known to cause compiler errors 
-on certain machines. If you get errors, try these commands to install libvorbis:
-</para>
+on certain machines. If you get errors, insert this command after running
+the configure script:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile &amp;&amp;
-make</command></userinput></screen>
+<screen><userinput><command>sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile</command></userinput></screen>
+
+<para>This package does not come with a test suite.</para>
 
 <para>Now, as the root user:</para>
 
@@ -93,16 +91,31 @@ documentation.</para>
 <sect2>
 <title>Contents</title>
 
-<para>The <application>libvorbis</application> package contains
-<filename class="libraryfile">libvorbis</filename> libraries.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
+<seglistitem>
+<seg>None</seg>
+<seg>libvorbis.[so,a], libvorbisenc.[so,a] and
+libvorbisfile.[so,a]</seg>
+<seg>/usr/include/vorbis and /usr/share/doc/libvorbis-&libvorbis-version;</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
-
-<sect3><title>vorbis libraries</title>
-<para><filename class="libraryfile">libvorbis</filename> libraries provide 
-the functions to read and write sound files.</para></sect3>
+<varlistentry id="libvorbis-lib">
+<term><filename class='libraryfile'>libvorbis*.[so,a]</filename></term>
+<listitem><para>libraries provide the functions to read and write sound
+files.</para>
+<indexterm zone="libvorbis libvorbis-lib">
+<primary sortas="c-libvorbis">libvorbis*.[so,a]</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>