diff --git a/x/wm/fluxbox.xml b/x/wm/fluxbox.xml
index 9f92db854d..5ba30ec961 100644
--- a/x/wm/fluxbox.xml
+++ b/x/wm/fluxbox.xml
@@ -6,6 +6,7 @@
 
   <!ENTITY fluxbox-download-http "http://prdownloads.sourceforge.net/fluxbox/fluxbox-&fluxbox-version;.tar.bz2">
   <!ENTITY fluxbox-download-ftp  " ">
+  <!ENTITY fluxbox-md5sum        "398f4e10d88b47507ea309968340961c">
   <!ENTITY fluxbox-size          "637 KB">
   <!ENTITY fluxbox-buildsize     "36.7 MB">
   <!ENTITY fluxbox-time          "1.28 SBU">
@@ -33,6 +34,7 @@ sortas="a-Fluxbox">Fluxbox</primary></indexterm>
 url="&fluxbox-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&fluxbox-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &fluxbox-md5sum;</para></listitem>
 <listitem><para>Download size: &fluxbox-size;</para></listitem>
 <listitem><para>Estimated disk space required:
 &fluxbox-buildsize;</para></listitem>
@@ -105,10 +107,12 @@ syntax is explained on the fluxbox man page.</para>
 
 <segmentedlist>
 <segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
 <segtitle>Installed Directory</segtitle>
 <seglistitem>
 <seg>fluxbox, fbsetbg, bsetroot, fluxbox-generate_menu, startfluxbox, and 
 fbrun</seg>
+<seg>None</seg>
 <seg>/usr/share/fluxbox and ~/.fluxbox</seg></seglistitem>
 </segmentedlist>
 
diff --git a/x/wm/sawfish.xml b/x/wm/sawfish.xml
index fba4ad7304..3b625b2ddd 100644
--- a/x/wm/sawfish.xml
+++ b/x/wm/sawfish.xml
@@ -6,6 +6,7 @@
 
 <!ENTITY sawfish-download-http "http://prdownloads.sourceforge.net/sawmill/sawfish-&sawfish-version;.tar.gz">
 <!ENTITY sawfish-download-ftp  " ">
+<!ENTITY sawfish-md5sum        "9e5ce5e76c60acecdb1889c1f173295a">
 <!ENTITY sawfish-size          "1.5 MB">
 <!ENTITY sawfish-buildsize     "17.5 MB">
 <!ENTITY sawfish-time          "0.26 SBU">
@@ -18,6 +19,8 @@
 </sect1info>
 <?dbhtml filename="sawfish.html" ?>
 <title>sawfish-&sawfish-version;</title>
+<indexterm zone="sawfish"><primary
+sortas="a-sawfish">sawfish</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>sawfish</application></title>
@@ -33,6 +36,7 @@ through the extension language.</para>
 url="&sawfish-download-http;"/></para></listitem>
 <listitem><para>Download (FTP): <ulink
 url="&sawfish-download-ftp;"/></para></listitem>
+<listitem><para>Download MD5 sum: &sawfish-md5sum;</para></listitem>
 <listitem><para>Download size: &sawfish-size;</para></listitem>
 <listitem><para>Estimated disk space required:
 &sawfish-buildsize;</para></listitem>
@@ -60,8 +64,11 @@ commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info \
   --disable-themer &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
 
@@ -85,8 +92,10 @@ This program was not migrated to <application>GTK-2</application>.</para>
 <sect2>
 <title>Configuring <application>sawfish</application></title>
 
-<sect3><title>Configuration Information</title>
-
+<sect3 id="sawfish-config"><title>Configuration Information</title>
+<indexterm zone="sawfish sawfish-config">
+<primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
+</indexterm>
 <para>Be sure to backup your current <filename>.xinitrc</filename>
 before proceeding.</para>
 
@@ -100,16 +109,48 @@ exec sawfish
 <sect2>
 <title>Contents</title>
 
-<para>The <application>sawfish</application> package contains 
-<command>sawfish</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directory</segtitle>
+<seglistitem>
+<seg>sawfish, sawfish-client and sawfish-ui</seg>
+<seg>None</seg>
+<seg>/usr/share/sawfish, /usr/sbin/sawfish and /usr/lib/rep/*/</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="sawfish-prog">
+<term><filename>sawfish</filename></term>
+<listitem><para>is the extensible window manager using a
+<application>Lisp</application>-based scripting language.</para>
+<indexterm zone="sawfish sawfish-prog">
+<primary sortas="b-sawfish">sawfish</primary></indexterm>
+</listitem>
+</varlistentry>
 
-<sect3><title>sawfish</title>
-<para><command>sawfish</command> is the extensible window manager using a 
-<application>Lisp</application>-based scripting language.</para></sect3>
+<varlistentry id="sawfish-client">
+<term><filename>sawfish-client</filename></term>
+<listitem><para>allows you to connect to a window manager process and
+evaluate arbitrary <application>Lisp</application> forms.</para>
+<indexterm zone="sawfish sawfish-client">
+<primary sortas="b-sawfish-client">sawfish-client</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="sawfish-ui">
+<term><filename>sawfish-ui</filename></term>
+<listitem><para>is the <application>sawfish</application> configurator.</para>
+<indexterm zone="sawfish sawfish-ui">
+<primary sortas="b-sawfish-ui">sawfish-ui</primary></indexterm>
+</listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>