diff --git a/basicnet/netprogs/tcpwrappers.xml b/basicnet/netprogs/tcpwrappers.xml
index 2b1f4fa205..8f9bfa2ea0 100644
--- a/basicnet/netprogs/tcpwrappers.xml
+++ b/basicnet/netprogs/tcpwrappers.xml
@@ -62,8 +62,11 @@ commands:</para>
 
 <screen><userinput><command>patch -Np1 -i ../tcp_wrappers-&tcpwrappers-version;-shared_lib_plus_plus-1.patch &amp;&amp;
 sed -i -e "s,^extern char \*malloc();,/* &amp; */," scaffold.c &amp;&amp;
-make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux &amp;&amp;
-make install</command></userinput></screen>
+make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
 
@@ -92,14 +95,14 @@ and all directories in the path leading to those files, should be
 accessible but not writable for unprivileged users (mode 755 or mode
 555). Do not install the wrapper set-uid.</para>
 
-<para>Then perform the following edits on the
+<para>As the root user, perform the following edits on the
 <filename>/etc/inetd.conf</filename> configuration file:</para>
 <indexterm zone="tcpwrappers tcpwrappers-config">
 <primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary></indexterm>
 
-<screen><userinput>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</userinput></screen>
+<screen><userinput role='root'>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</userinput></screen>
 <para>becomes:</para>
-<screen><userinput>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</userinput></screen>
+<screen><userinput role='root'>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</userinput></screen>
 
 <note><para>The finger server is used as an example here.</para></note>
 
@@ -187,7 +190,6 @@ to become <quote><application>tcpwrappers</application>-aware</quote>.</para>
 <primary sortas="c-libwrap">libwrap.[so,a]</primary>
 </indexterm></listitem>
 </varlistentry>
-
 </variablelist>
 
 </sect2>
diff --git a/postlfs/security/shadow.xml b/postlfs/security/shadow.xml
index 2e97b23eff..fe9636479a 100644
--- a/postlfs/security/shadow.xml
+++ b/postlfs/security/shadow.xml
@@ -71,7 +71,7 @@ this will allow programs like <command>login</command> and
 commands:</para>
 
 <screen><userinput><command>patch -Np1 -i ../shadow-&shadow-version;-fix_lastlog-1.patch &amp;&amp;
-./configure --libdir=/usr/lib --enable-shared \
+./configure --libdir=/lib --enable-shared \
     --with-libpam --without-libcrack &amp;&amp;
 sed -i 's/groups$(EXEEXT) //' src/Makefile &amp;&amp;
 sed -i '/groups/d' man/Makefile &amp;&amp;
diff --git a/server/other/xinetd.xml b/server/other/xinetd.xml
index d8a00f8d91..261b1b272b 100644
--- a/server/other/xinetd.xml
+++ b/server/other/xinetd.xml
@@ -8,8 +8,8 @@
 <!ENTITY xinetd-download-ftp " ">
 <!ENTITY xinetd-md5sum "4295b5fe12350f09b5892b363348ac8b">
 <!ENTITY xinetd-size "291 KB">
-<!ENTITY xinetd-buildsize "3.91 MB">
-<!ENTITY xinetd-time "0.09 SBU">
+<!ENTITY xinetd-buildsize "4.12 MB">
+<!ENTITY xinetd-time "0.11 SBU">
 ]>
 
 <sect1 id="xinetd" xreflabel="xinetd-&xinetd-version;">
@@ -19,6 +19,8 @@
 </sect1info>
 <?dbhtml filename="xinetd.html"?>
 <title>xinetd-&xinetd-version;</title>
+<indexterm zone="xinetd">
+<primary sortas="a-Xinetd">Xinetd</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>xinetd</application></title>
@@ -55,16 +57,21 @@ Daemon, a secure replacement for <command>inetd</command>.</para>
 commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr &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>
 
 <sect2>
 <title>Configuring <application>xinetd</application></title>
 
-<sect3><title>Config files</title>
+<sect3 id="xinetd-config"><title>Config files</title>
 <para><filename>/etc/xinetd.conf</filename></para>
+<indexterm zone="xinetd xinetd-config">
+<primary sortas="e-etc-xinetd.conf">/etc/xinetd.conf</primary></indexterm>
 </sect3>
 
 <sect3><title>Configuration Information</title>
@@ -73,35 +80,38 @@ make install</command></userinput></screen>
 <filename class="directory">/usr/sbin</filename>, rather than the default path 
 of <filename class="directory">/usr/etc</filename>, and install the 
 <application>xinetd</application> configuration file by running the following
-command:</para>
+command as the root user:</para>
 
-<screen><userinput><command>sed -e 's/etc/sbin/g' xinetd/sample.conf &gt; /etc/xinetd.conf</command>
+<screen><userinput role='root'><command>sed -e 's/etc/sbin/g' xinetd/sample.conf &gt; /etc/xinetd.conf</command>
 </userinput></screen>
 
 <para>The format of the <filename>/etc/xinetd.conf</filename> is
-documented in the xinetd.conf man page. Further information can be
-found at <ulink url="http://www.xinetd.org"/>.</para>
+documented in the <filename>xinetd.conf.5</filename> man page. Further 
+information can be found at <ulink url="http://www.xinetd.org"/>.</para>
 
-<para>Install the <filename>/etc/rc.d/init.d/xinetd</filename>
-init script included in the <xref linkend="intro-important-bootscripts"/> 
-package.</para>
+<para id="xinetd-init">As the root user, install the 
+<filename>/etc/rc.d/init.d/xinetd</filename> init script included in the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+<indexterm zone="xinetd xinetd-init">
+<primary sortas="f-xinetd">xinetd</primary></indexterm>
 
-<screen><userinput><command>make install-xinetd</command></userinput></screen>
+<screen><userinput role='root'><command>make install-xinetd</command></userinput></screen>
 
-<para>Now, use the new boot script to start <command>xinetd</command>:</para>
+<para>As the root user, use the new boot script to start 
+<command>xinetd</command>:</para>
 
-<screen><userinput><command>/etc/rc.d/init.d/xinetd start</command></userinput></screen>
+<screen><userinput role='root'><command>/etc/rc.d/init.d/xinetd start</command></userinput></screen>
 
 <para>Checking the <filename>/var/log/daemon.log</filename> file
 should prove quite entertaining. This file may contain entries
 similar to the following:</para>
 
-<screen><userinput>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not 
+<screen>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not 
 executable [line=29]
 Aug 22 21:40:21 dps10 xinetd[2696]: Error parsing attribute server -
 DISABLING SERVICE [line=29]
 Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
-executable [line=42]</userinput></screen>
+executable [line=42]</screen>
 
 <para>These errors are because most of the servers <command>xinetd</command> 
 is trying to control are not installed yet.</para>
@@ -112,28 +122,51 @@ is trying to control are not installed yet.</para>
 <sect2>
 <title>Contents</title>
 
-<para>The <application>xinetd</application> package contains
-<command>xinetd</command>,
-<command>itox</command> and
-<command>xconv.pl</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 
-</sect2>
+<seglistitem>
+<seg>itox, xconv.pl and xinetd</seg>
+<seg>None</seg>
+<seg>None</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>xinetd</title>
-<para><command>xinetd</command> is the Internet services daemon.</para></sect3>
+<varlistentry id="itox">
+<term><command>itox</command></term>
+<listitem><para>is a utility used for converting 
+<filename>inetd.conf</filename> files to 
+<filename>xinetd.conf</filename> format.</para>
+<indexterm zone="xinetd itox">
+<primary sortas="b-itox">itox</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>itox</title>
-<para><command>itox</command> is a utility used for converting
-<filename>inetd.conf</filename> files to
-<filename>xinetd.conf</filename> format.</para></sect3>
+<varlistentry id="xconv.pl">
+<term><command>xconv.pl</command></term>
+<listitem><para>is a <application>Perl</application> script used for 
+converting <filename>inetd.conf</filename> files to
+<filename>xinetd.conf</filename> format, similar to
+<command>itox</command>.</para>
+<indexterm zone="xinetd xconv.pl">
+<primary sortas="b-xconv.pl">xconv.pl</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>xconv.pl</title>
-<para><command>xconv.pl</command> is a <application>Perl</application> script 
-used for converting <filename>inetd.conf</filename> files to 
-<filename>xinetd.conf</filename> format, similar to 
-<command>itox</command>.</para></sect3>
+<varlistentry id="xinetd-prog">
+<term><command>xinetd</command></term>
+<listitem><para>is the Internet services daemon.</para>
+<indexterm zone="xinetd xinetd-prog">
+<primary sortas="b-xinetd">xinetd</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>