diff --git a/gnome/otherlibs/soup.xml b/gnome/otherlibs/soup.xml
index 7498b5a90a..1fcd2aa20e 100644
--- a/gnome/otherlibs/soup.xml
+++ b/gnome/otherlibs/soup.xml
@@ -4,103 +4,122 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY soup-download-http "http://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-&soup-version;.tar.bz2">
-<!ENTITY soup-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-&soup-version;.tar.bz2">
-<!ENTITY soup-md5sum "61bb2fef816ce164af62f8a3a5bd782e">
-<!ENTITY soup-size "324 KB">
-<!ENTITY soup-buildsize "9.4 MB">
-<!ENTITY soup-time "0.27">
+  <!ENTITY soup-download-http "http://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-&soup-version;.tar.bz2">
+  <!ENTITY soup-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/soup/0.7/soup-&soup-version;.tar.bz2">
+  <!ENTITY soup-md5sum "61bb2fef816ce164af62f8a3a5bd782e">
+  <!ENTITY soup-size "324 KB">
+  <!ENTITY soup-buildsize "9.4 MB">
+  <!ENTITY soup-time "0.27">
 ]>
 
 <sect1 id="soup" xreflabel="Soup-&soup-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="soup.html"?>
-<title><application>Soup</application>-&soup-version;</title>
+  <?dbhtml filename="soup.html"?>
 
-<sect2>
-<title>Introduction to <application>Soup</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>Soup</application> package contains a
-<acronym>SOAP</acronym> (Simple Object Access Protocol)
-implementation in <application>C</application>.</para>
+  <title>Soup-&soup-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&soup-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&soup-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &soup-md5sum;</para></listitem>
-<listitem><para>Download size: &soup-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&soup-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&soup-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="soup">
+    <primary sortas="a-Soup">Soup</primary>
+  </indexterm>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch (if compiled with 
-<application><acronym>GCC</acronym></application>-3.4.x): <ulink 
-url="&patch-root;/soup-&soup-version;-gcc_3.4-1.patch"/></para></listitem>
-</itemizedlist>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to Soup</title>
 
-<sect3><title><application>Soup</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GLib"/> or <xref linkend="glib2"/>, 
-<xref linkend="libxml"/> or <xref linkend="libxml2"/> and 
-<xref linkend="popt"/></para>
-</sect4>
+    <para>The <application>Soup</application> package contains a SOAP (Simple
+    Object Access Protocol) implementation in C.</para>
 
-<sect4><title>Optional</title>
-<para><xref linkend="apache"/>, 
-<xref linkend="openssl"/> or 
-<xref linkend="mozilla"/> (for the <acronym>NSS</acronym> libraries), 
-<xref linkend="gtk-doc"/> and 
-<xref linkend="docbook-utils"/></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&soup-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&soup-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &soup-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &soup-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &soup-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &soup-time;</para>
+      </listitem>
+    </itemizedlist>
 
-</sect2>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch (if compiled with
+        <application>GCC</application>-3.4.x): <ulink
+        url="&patch-root;/soup-&soup-version;-gcc_3.4-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>Soup</application></title>
+    <bridgehead renderas="sect3">Soup Dependencies</bridgehead>
 
-<para>Install <application>Soup</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="GLib"/> or <xref linkend="glib2"/>,
+    <xref linkend="libxml"/> or <xref linkend="libxml2"/> and
+    <xref linkend="popt"/></para>
 
-<screen><userinput><command>patch -Np1 -i ../soup-&soup-version;-gcc_3.4-1.patch &amp;&amp;
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="apache"/>,
+    <xref linkend="openssl"/> or
+    <xref linkend="mozilla"/> (for the NSS libraries),
+    <xref linkend="gtk-doc"/> and
+    <xref linkend="docbook-utils"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Soup</title>
+
+    <para>Install <application>Soup</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../soup-&soup-version;-gcc_3.4-1.patch &amp;&amp;
 ./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen>
+make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><parameter>--prefix=/opt/gnome</parameter>: Installs 
-<application>Soup</application> in the
-<application><acronym>GNOME</acronym></application> 1.4 directory
-structure.</para>
+    <para><parameter>--prefix=/opt/gnome</parameter>: Installs
+    <application>Soup</application> in the
+    <application>GNOME</application> 1.4 directory structure.</para>
 
-<para><parameter>--enable-apache=no</parameter>: This command can be added
-to prevent building against <application>Apache</application>.</para>
+    <para><option>--enable-apache=no</option>: This command can be added
+    to prevent building against <application>Apache</application>.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>The <application>Soup</application> package contains
-<acronym>SOAP</acronym> libraries, used to implement
-<acronym>XML</acronym> remote procedure calls.</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>None</seg>
+        <seg>SOAP libraries</seg>
+        <seg>Not determined at this time</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
 
 </sect1>