diff --git a/general/genlib/lzo.xml b/general/genlib/lzo.xml
index d22740e28a..2c3d1ed8f4 100644
--- a/general/genlib/lzo.xml
+++ b/general/genlib/lzo.xml
@@ -4,101 +4,115 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY LZO-download-http "http://www.oberhumer.com/opensource/lzo/download/lzo-&LZO-version;.tar.gz">
-<!ENTITY LZO-download-ftp "http://ftp.uni-koeln.de/util/arc/lzo-&LZO-version;.tar.gz">
-<!ENTITY LZO-md5sum "ab94d3da364c7cbd5b78d76f1875b0f6">
-<!ENTITY LZO-size "426 KB">
-<!ENTITY LZO-buildsize "7.5 MB">
-<!ENTITY LZO-time "0.24 SBU">
+  <!ENTITY LZO-download-http "http://www.oberhumer.com/opensource/lzo/download/lzo-&LZO-version;.tar.gz">
+  <!ENTITY LZO-download-ftp "http://ftp.uni-koeln.de/util/arc/lzo-&LZO-version;.tar.gz">
+  <!ENTITY LZO-md5sum "ab94d3da364c7cbd5b78d76f1875b0f6">
+  <!ENTITY LZO-size "426 KB">
+  <!ENTITY LZO-buildsize "7.5 MB">
+  <!ENTITY LZO-time "0.24 SBU">
 ]>
 
 <sect1 id="LZO" xreflabel="LZO-&LZO-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="LZO.html"?>
-<title><acronym>LZO</acronym>-&LZO-version;</title>
-<indexterm zone="LZO">
-<primary sortas="a-LZO">LZO</primary></indexterm>
+  <?dbhtml filename="LZO.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>LZO-&LZO-version;</title>
+  
+  <indexterm zone="LZO">
+    <primary sortas="a-LZO">LZO</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to <application><acronym>LZO</acronym></application></title>
+  <sect2 role="package">
+    <title>Introduction to LZO</title>
+    
+    <para><application>LZO</application> is a data compression
+    library which is suitable for data decompression and compression in real-time.
+    This means it favors speed over compression ratio.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&LZO-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&LZO-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &LZO-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &LZO-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &LZO-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &LZO-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">LZO Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="NASM"/> and 
+    <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of LZO</title>
 
-<para><application><acronym>LZO</acronym></application> is a data compression
-library which is suitable for data decompression and compression in real-time.
-This means it favors speed over compression ratio.</para>
+    <para>Install <application>LZO</application> by running the
+    following commands:</para>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&LZO-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&LZO-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &LZO-md5sum;</para></listitem>
-<listitem><para>Download size: &LZO-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&LZO-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&LZO-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application><acronym>LZO</acronym></application> 
-dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="NASM"/> and 
-<ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application><acronym>LZO</acronym></application></title>
-
-<para>Install <application><acronym>LZO</acronym></application> by running the
-following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr --enable-shared &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --enable-shared &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/lzo-&LZO-version; &amp;&amp;
-install -v -m644 doc/* /usr/share/doc/lzo-&LZO-version;</command></userinput></screen>
+install -v -m644 doc/* /usr/share/doc/lzo-&LZO-version;</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-</sect2>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+      
+      <seglistitem>
+        <seg>None</seg>
+        <seg>liblzo.[so,a]</seg>
+        <seg>/usr/share/doc/lzo-&LZO-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+    
+      <varlistentry id="liblzo">
+        <term><filename class='libraryfile'>liblzo.[so,a]</filename></term>
+        <listitem>
+          <para>is a data compression and decompression library.</para>
+          <indexterm zone="LZO liblzo">
+            <primary sortas="c-liblzo">liblzo.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
 
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Library</segtitle>
-<segtitle>Installed Directory</segtitle>
-
-<seglistitem>
-<seg>None</seg>
-<seg>liblzo.[so,a]</seg>
-<seg>/usr/share/doc/lzo-&LZO-version;</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="liblzo">
-<term><filename class='libraryfile'>liblzo.[so,a]</filename></term>
-<listitem><para>is a data compression and decompression library.</para>
-<indexterm zone="LZO liblzo">
-<primary sortas="c-liblzo">liblzo.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
 
 </sect1>