diff --git a/general/genlib/xapian.xml b/general/genlib/xapian.xml
index e3c9ea3404..e97a004230 100644
--- a/general/genlib/xapian.xml
+++ b/general/genlib/xapian.xml
@@ -70,7 +70,8 @@
     running the following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr \
-          --disable-static &amp;&amp;
+            --disable-static \
+            --docdir=/usr/share/doc/xapian-core-&xapian-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -102,7 +103,9 @@ make</userinput></screen>
           libxapian.so
         </seg>
         <seg>
-          /usr/include/xapian, /usr/lib/cmake/xapian and /usr/share/doc/xapian-core
+          /usr/include/xapian, 
+          /usr/lib/cmake/xapian, and 
+          /usr/share/doc/xapian-core-&xapian-version;
         </seg>
       </seglistitem>
     </segmentedlist>
diff --git a/gnome/platform/vte.xml b/gnome/platform/vte.xml
index 8a69cb0df5..ec3c05e547 100644
--- a/gnome/platform/vte.xml
+++ b/gnome/platform/vte.xml
@@ -169,27 +169,27 @@ make</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="vte2-&vte-nano;">
+      <varlistentry id="vte291">
         <term><command>vte2_&vte-nano;</command></term>
         <listitem>
           <para>
             is a test application for the <application>VTE</application>
             libraries.
           </para>
-          <indexterm zone="vte vte2-&vte-nano;">
+          <indexterm zone="vte vte291">
             <primary sortas="b-vte2-&vte-nano;">vte2_&vte-nano;</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libvte2-&vte-nano;">
+      <varlistentry id="libvte291">
         <term><filename class="libraryfile">libvte2_&vte-nano;.so</filename></term>
         <listitem>
           <para>
             is a library which implements a terminal emulator
             widget for <application>GTK+ 3</application>.
           </para>
-          <indexterm zone="vte libvte2-&vte-nano;">
+          <indexterm zone="vte libvte291">
             <primary sortas="c-libvte2-&vte-nano;">libvte2_&vte-nano;.so</primary>
           </indexterm>
         </listitem>
diff --git a/networking/netutils/wicd.xml b/networking/netutils/wicd.xml
index d5d749c8f1..0ed99bfd43 100644
--- a/networking/netutils/wicd.xml
+++ b/networking/netutils/wicd.xml
@@ -61,14 +61,7 @@
         <para>Estimated build time: &wicd-time;</para>
       </listitem>
     </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para></para>
-      </listitem>
-    </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Wicd Dependencies</bridgehead>
 
     <note><para>Wicd uses <command>ifconfig</command> to activate network
@@ -116,10 +109,12 @@
 
 <screen><userinput>sed -i '/wpath.logrotate\|wpath.systemd/d' setup.py &amp;&amp;
 rm po/*.po                                          &amp;&amp;
+
 python setup.py configure --no-install-kde     \
                           --no-install-acpi    \
                           --no-install-pmutils \
-                          --no-install-init</userinput></screen>
+                          --no-install-init    \
+                          --docdir=/usr/share/doc/wicd-&wicd-version;</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
@@ -132,15 +127,15 @@ python setup.py configure --no-install-kde     \
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i '/wpath...</command>: This <command>sed</command>
+    prevents installation of <command>logrotate</command> and systemd
+    configuration files. You may omit it if you use these utilities.</para>
+
     <para><command>rm po/*.po</command>: This command removes the international
     messages associated with this package.  The command is required unless
     Babel is installed.  If it is installed, po/ast.po still needs to be removed
     in order for the build to complete.</para>
 
-    <para><command>sed -i '/wpath...</command>: This <command>sed</command>
-    prevents installation of <command>logrotate</command> and systemd
-    configuration files. You may omit it if you use these utilities.</para>
-
     <para><option>--no-install-kde</option>: Prevent installation of an
     autostart desktop file for KDE. If you use KDE, you should instead install the
     <ulink url="http://projects.kde.org/projects/extragear/network/wicd-kde">Wicd KDE Client</ulink>.
diff --git a/postlfs/filesystems/xfsprogs.xml b/postlfs/filesystems/xfsprogs.xml
index 5a8bb2c384..3605bcaf18 100644
--- a/postlfs/filesystems/xfsprogs.xml
+++ b/postlfs/filesystems/xfsprogs.xml
@@ -92,10 +92,10 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install     &amp;&amp;
-make install-dev &amp;&amp;
-rm -rfv /lib/libhandle.{a,la,so} &amp;&amp;
-ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so &amp;&amp;
+<screen role="root"><userinput>make PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install     &amp;&amp;
+make PKG_DOC_DIR=/usr/share/doc/xfsprogs-&xfsprogs-version; install-dev &amp;&amp;
+rm -rfv /lib/libhandle.{a,la,so}                          &amp;&amp;
+ln -sfv ../../lib/libhandle.so.1 /usr/lib/libhandle.so    &amp;&amp;
 sed -i "s@libdir='/lib@libdir='/usr/lib@g" /usr/lib/libhandle.la</userinput></screen>
 
   </sect2>
@@ -136,7 +136,7 @@ sed -i "s@libdir='/lib@libdir='/usr/lib@g" /usr/lib/libhandle.la</userinput></sc
         xfs_logprint, xfs_mdrestore, xfs_metadump, xfs_mkfile, xfs_ncheck,
         xfs_quota, xfs_repair, and xfs_rtcp</seg>
         <seg>libhandle.{so,a}</seg>
-        <seg>/usr/include/xfs and /usr/share/doc/xfsprogs</seg>
+        <seg>/usr/include/xfs and /usr/share/doc/xfsprogs-&xfsprogs-version;</seg>
       </seglistitem>
     </segmentedlist>