Index: basicnet/djb/daemontools/daemontools-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-inst.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/djb/daemontools/daemontools-inst.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -6,5 +6,5 @@
 
 <screen><userinput><command>cd admin/daemontools-0.76 &amp;&amp; 
-patch -Np1 -i ../../daemontools-0.76.errno.patch &amp;&amp;
+patch -Np1 -i ../../daemontools-0.76-errno.patch &amp;&amp;
 package/compile &amp;&amp;
 cd package &amp;&amp; 
Index: basicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/djb/daemontools/daemontools-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -23,7 +23,6 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required patch:
-<ulink
-url="ftp://moni.csi.hu/pub/glibc-2.3.1/daemontools-0.76.errno.patch">daemontools
-errno patch</ulink></para></listitem></itemizedlist>
+<ulink url="&patch-root;/daemontools-0.76-errno.patch"/></para></listitem>
+</itemizedlist>
 </sect3>
 
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -5,5 +5,5 @@
 commands:</para>
 
-<screen><userinput><command>patch -Np1 -i ../ucspi-tcp-0.88.errno.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../ucspi-tcp-0.88-errno.patch &amp;&amp;
 sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;
 mv conf-home~ conf-home &amp;&amp;
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -26,8 +26,6 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Required patch: <ulink
-url="ftp://moni.csi.hu/pub/glibc-2.3.1/ucspi-tcp-0.88.errno.patch">ucspi-tcp
-errno patch</ulink>
-</para></listitem></itemizedlist>
+<listitem><para>Required patch: <ulink url="&patch-root;/ucspi-tcp-0.88-errno.patch"/></para></listitem>
+</itemizedlist>
 </sect3>
 
Index: basicnet/mailnews/pine/pine-inst.xml
===================================================================
--- basicnet/mailnews/pine/pine-inst.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/mailnews/pine/pine-inst.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -1,7 +1,4 @@
 <sect2>
 <title>Installation of <application>Pine</application></title>
-
-<para>Download the <application>Pine</application>
-<acronym>FHS</acronym> patch from <ulink url="&hfile-root;"/>.</para>
 
 <para>Install <application>Pine</application> by running the following commands: </para>
Index: basicnet/mailnews/pine/pine-intro.xml
===================================================================
--- basicnet/mailnews/pine/pine-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/mailnews/pine/pine-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -27,3 +27,10 @@
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/pine-4.56-fhs.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
 </sect2>
Index: basicnet/mailnews/pine/pine.ent
===================================================================
--- basicnet/mailnews/pine/pine.ent	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/mailnews/pine/pine.ent	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -8,5 +8,4 @@
 <!ENTITY pine-version "4.56">
 <!ENTITY pine-download-http "http://mirror.sit.wisc.edu/pub/net/mail/pine/pine&pine-version;.tar.bz2">
-<!ENTITY blfs-patch-dir "&hfile-root;">
 <!ENTITY pine-download-ftp "ftp://ftp.cac.washington.edu/pine/pine&pine-version;.tar.bz2">
 <!ENTITY pine-size "2.8 MB">
Index: basicnet/netlibs/wvstreams/wvstreams-intro.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -17,7 +17,7 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink
-url="&hfile-root;/wvstreams-&wvstreams-version;-wvcrypto.patch"/></para></listitem>
+url="&patch-root;/wvstreams-&wvstreams-version;-wvcrypto.patch"/></para></listitem>
 <listitem><para>Required Patch: <ulink
-url="&hfile-root;/wvstreams-&wvstreams-version;-wvresolver.patch"/></para></listitem>
+url="&patch-root;/wvstreams-&wvstreams-version;-wvresolver.patch"/></para></listitem>
 </itemizedlist></sect3>
 
Index: basicnet/netprogs/cvs/cvs-inst.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-inst.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netprogs/cvs/cvs-inst.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -2,4 +2,5 @@
 <title>Installation of <application><acronym>CVS</acronym></application></title>
 
+<!--
 <para>The <filename>cvs-&cvs-version;-zlib.patch</filename> patch is
 used to compile <application><acronym>CVS</acronym></application>
@@ -15,4 +16,5 @@
 
 <screen><userinput><command>patch -Np1 -i ../cvs-&cvs-version;-zlib.patch</command></userinput></screen>
+-->
 
 <para>Install <application><acronym>cvs</acronym></application> by running the following commands:</para>
Index: basicnet/netprogs/cvs/cvs-intro.xml
===================================================================
--- basicnet/netprogs/cvs/cvs-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netprogs/cvs/cvs-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -15,7 +15,9 @@
 </sect3>
 
+<!--
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Optional Patch: <ulink url="&hfile-root;/cvs-&cvs-version;-zlib.patch"/></para></listitem></itemizedlist></sect3>
+-->
 
 </sect2>
Index: basicnet/netprogs/inetutils/inetutils-exp.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-exp.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netprogs/inetutils/inetutils-exp.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -11,4 +11,9 @@
 </para>
 
+<para><option>--disable-whois</option>: This switch will prevent
+<application>Inetutils</application> installing a WhoIs client, since the
+included whois client is out of date. Add this option if you plan on installing
+<xref linkend="whois"/>.</para>
+
 <para><option>--with-pam</option>: This switch makes <application>Inetutils
 </application> compile against for <application>Linux-<acronym>PAM</acronym>
Index: basicnet/netprogs/inetutils/inetutils-inst.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-inst.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netprogs/inetutils/inetutils-inst.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -7,7 +7,9 @@
 <screen><userinput><command>./configure --prefix=/usr --disable-syslogd \
 	--libexecdir=/usr/sbin --infodir=/usr/share/info \
+    --sysconfdir=/etc --localstatedir=/var \
 	--mandir=/usr/share/man --with-wrap &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen>
+make install &amp;&amp;
+mv /usr/bin/ping /bin</command></userinput></screen>
 
 </sect2>
Index: basicnet/netprogs/inetutils/inetutils-intro.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netprogs/inetutils/inetutils-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -3,5 +3,7 @@
 
 <para>The <application>Inetutils</application> package contains network clients 
-and servers.</para>
+and servers. <application>Inetutils</application> installation in LFS lacks
+installation of the various servers that are included in the package. The instructions
+in <acronym>BLFS</acronym> removes this deficiency.</para>
 
 <sect3><title>Package information</title>
@@ -16,5 +18,5 @@
 <sect3><title><application>Inetutils</application> dependencies</title>
 <sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/></para></sect4>
+<para><xref linkend="Linux_PAM"/>, and <xref linkend="tcpwrappers"/></para></sect4>
 </sect3>
 
Index: basicnet/netutils/bind-utils/bind-utils-intro.xml
===================================================================
--- basicnet/netutils/bind-utils/bind-utils-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netutils/bind-utils/bind-utils-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -4,5 +4,5 @@
 <para><application><acronym>BIND</acronym> Utilities</application> is not a 
 separate package, it is a collection of the client side programs that are 
-included with <application><acronym>BIND</acronym></application>. The 
+included with <application><xref linkend="bind"/></application>. The 
 <application><acronym>BIND</acronym></application> package includes client 
 side programs such as <command>nslookup</command>, <command>dig</command> and 
Index: basicnet/netutils/nmap/nmap-intro.xml
===================================================================
--- basicnet/netutils/nmap/nmap-intro.xml	(revision c2ee009c742ff365bb2dc66a72cfaaadae6992d4)
+++ basicnet/netutils/nmap/nmap-intro.xml	(revision f7000b3d63369c2369b0b9becc791839d2fe15d2)
@@ -16,3 +16,8 @@
 </sect3>
 
+<sect3><title><application>Nmap</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="GTK"/> (for building the front-end)</para></sect4>
+</sect3>
+
 </sect2>
