diff --git a/gnome/add/gnome-system-monitor.xml b/gnome/add/gnome-system-monitor.xml
index 3c644f696d..d4a45418d7 100644
--- a/gnome/add/gnome-system-monitor.xml
+++ b/gnome/add/gnome-system-monitor.xml
@@ -4,115 +4,146 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY gnome-system-monitor-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
-<!ENTITY gnome-system-monitor-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
-<!ENTITY gnome-system-monitor-md5sum "22acb1699193f8bd2ced656d44f57377">
-<!ENTITY gnome-system-monitor-size "766 KB">
-<!ENTITY gnome-system-monitor-buildsize "8 MB">
-<!ENTITY gnome-system-monitor-time "0.1 SBU">
+  <!ENTITY gnome-system-monitor-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+  <!ENTITY gnome-system-monitor-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+  <!ENTITY gnome-system-monitor-md5sum "22acb1699193f8bd2ced656d44f57377">
+  <!ENTITY gnome-system-monitor-size "766 KB">
+  <!ENTITY gnome-system-monitor-buildsize "8 MB">
+  <!ENTITY gnome-system-monitor-time "0.1 SBU">
 ]>
 
-<sect1 id="gnome-system-monitor" 
+<sect1 id="gnome-system-monitor"
 xreflabel="GNOME System Monitor-&gnome-system-monitor-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gnome-system-monitor.html"?>
-<title>GNOME System Monitor-&gnome-system-monitor-version;</title>
+  <?dbhtml filename="gnome-system-monitor.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>GNOME</acronym> System 
-Monitor</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>GNOME</acronym> System Monitor</application> 
-package contains <command>gnome-system-monitor</command>, GNOME's replacement 
-for <command>gtop</command>.</para>
+  <title>GNOME System Monitor-&gnome-system-monitor-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gnome-system-monitor-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gnome-system-monitor-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5sum: 
-&gnome-system-monitor-md5sum;</para></listitem>
-<listitem><para>Download size: 
-&gnome-system-monitor-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gnome-system-monitor-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gnome-system-monitor-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gnome-system-monitor">
+    <primary sortas="a-GNOME System Monitor">GNOME System Monitor</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>GNOME</acronym> System 
-Monitor</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libgnomeui"/>, 
-<xref linkend="libwnck"/> and 
-<xref linkend="libgtop"/></para>
-</sect4>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to GNOME System Monitor</title>
 
-</sect2>
+    <para>The <application>GNOME System Monitor</application> package contains
+    <command>gnome-system-monitor</command>, GNOME's replacement for
+    <command>gtop</command>.</para>
 
-<sect2>
-<title>Installation of <application><acronym>GNOME</acronym> System 
-Monitor</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP):
+        <ulink url="&gnome-system-monitor-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP):
+        <ulink url="&gnome-system-monitor-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-system-monitor-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-system-monitor-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-system-monitor-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-system-monitor-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application><acronym>GNOME</acronym> System 
-Monitor</application> by running the following commands:</para>
+    <bridgehead renderas="sect3">GNOME System Monitor Dependencies</bridgehead>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libgnomeui"/>,
+    <xref linkend="libwnck"/> and
+    <xref linkend="libgtop"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME System Monitor</title>
+
+    <para>Install <application>GNOME System Monitor</application> by running
+    the following commands:</para>
+
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --localstatedir=/var/lib --sysconfdir=/etc/gnome &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Now, as the root user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
 <!-- This should not be necessary any longer, but leaving it as a comment
 
-<note><para><command>make install</command> will need path access to 
-<filename class="directory">$GNOME_PREFIX/bin</filename>. If you use the 
-root account for installation of the package and your preinstallation changes 
-were made only to a user's account, you will need to adjust root's path prior 
+<note><para><command>make install</command> will need path access to
+<filename class="directory">$GNOME_PREFIX/bin</filename>. If you use the
+root account for installation of the package and your preinstallation changes
+were made only to a user's account, you will need to adjust root's path prior
 to running <command>make install</command>.</para></note>
 
  -->
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><parameter>--localstatedir=/var/lib</parameter>: This switch 
-puts <application>ScrollKeeper</application> files in 
-<filename class="directory">/var/lib/scrollkeeper</filename> instead of 
-<filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+    <para><parameter>--localstatedir=/var/lib</parameter>: This switch
+    puts <application>ScrollKeeper</application> files in
+    <filename class="directory">/var/lib/scrollkeeper</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
-configuration files in <filename class="directory">/etc/gnome</filename> 
-instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+    configuration files in <filename class="directory">/etc/gnome</filename>
+    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>The <application><acronym>GNOME</acronym> System Monitor</application> 
-package contains <command>gnome-system-monitor</command>.</para>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>gnome-system-monitor</seg>
+        <seg>None</seg>
+        <seg>/etc/gnome/gconf/gconf.xml.defaults/apps/procman,
+        /etc/gnome/gconf/gconf.xml.defaults/schemas/apps/procman,
+        $GNOME_PREFIX/share/gnome/help/gnome-system-monitor, and,
+        $GNOME_PREFIX/share/omf/gnome-system-monitor</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2><title>Description</title>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<sect3><title>gnome-system-monitor</title>
-<para><command>gnome-system-monitor</command> displays the process tree and 
-hardware meters.</para></sect3>
+      <varlistentry id="gnome-system-monitor-prog">
+        <term><command>gnome-system-monitor</command></term>
+        <listitem>
+          <para>displays the process tree and hardware meters.</para>
+          <indexterm zone="gnome-system-monitor gnome-system-monitor-prog">
+            <primary sortas="b-gnome-system-monitor">gnome-system-monitor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>