Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision 6b267c3a4514ead1a7a39aa428a6da3f6239a938)
+++ appendices/glossary.xml	(revision c6286594af209840e62ad884336f04d8e89b54a3)
@@ -375,4 +375,7 @@
 <glossdef><para>Musical Instrument Digital Interface</para></glossdef></glossentry>
 
+<glossentry id="gMII"><glossterm><acronym>MII</acronym></glossterm>
+<glossdef><para>Media Independent Interface</para></glossdef></glossentry>
+
 <glossentry id="gMIME"><glossterm><acronym>MIME</acronym></glossterm>
 <glossdef><para>Multipurpose Internet Mail Extensions</para></glossdef></glossentry>
Index: basicnet/netprogs/net-tools.xml
===================================================================
--- basicnet/netprogs/net-tools.xml	(revision 6b267c3a4514ead1a7a39aa428a6da3f6239a938)
+++ basicnet/netprogs/net-tools.xml	(revision c6286594af209840e62ad884336f04d8e89b54a3)
@@ -6,14 +6,18 @@
 
   <!ENTITY net-tools-download-http "http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-&net-tools-version;.tar.bz2">
-  <!ENTITY net-tools-download-ftp  " ">
+  <!ENTITY net-tools-download-ftp  "ftp://ftp.ibiblio.org/pub/Linux/distributions/rootlinux/rootlinux-1.3/source/base/net-tools/net-tools-&net-tools-version;.tar.gz">
   <!ENTITY net-tools-size          "194 KB">
-  <!ENTITY net-tools-buildsize     "9.4 MB">
+  <!ENTITY net-tools-buildsize     "4.3 MB">
   <!ENTITY net-tools-time          "0.10 SBU">
+  <!ENTITY lfs-coreutils-version   "5.2.1">
 ]>
 
 <sect1 id="net-tools" xreflabel="Net-tools-&net-tools-version;">
+<sect1info>
+<othername>$LastChangedBy$</othername>
+<date>$Date$</date>
+</sect1info>
 <?dbhtml filename="net-tools.html"?>
 <title>Net-tools-&net-tools-version;</title>
-
 
 <sect2>
@@ -33,11 +37,12 @@
 </sect3>
 
-<!--
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing="compact">
-<listitem><para>Required Patch: <ulink
+<listitem><para>Required Patch (if compiling using 
+<application>GCC</application>-3.4.x): <ulink
 url="&patch-root;/net-tools-&net-tools-version;-gcc34-3.patch"/></para></listitem>
-</itemizedlist></sect3>
--->
+<listitem><para>Required Patch (if using LFS >= 6.0): <ulink
+url="&patch-root;/net-tools-&net-tools-version;-kernel_headers-2.patch"/></para>
+</listitem></itemizedlist></sect3>
 
 </sect2>
@@ -45,8 +50,19 @@
 <sect2>
 <title>Installation of <application>Net-tools</application></title>
+
+<note><para>The <application>Net-tools</application> package installs a 
+<command>hostname</command> program which will overwrite the existing program 
+installed by <application>Coreutils</application> during a base 
+<acronym>LFS</acronym> installation. If, for whatever reason, you need to 
+reinstall the <application>Coreutils</application> package after installing 
+<application>Net-tools</application>, you should use the 
+<filename>coreutils-&lfs-coreutils-version;-suppress_hostname_uptime_kill_su-1.patch</filename> 
+patch if you wish to preserve the <application>Net-tools</application> 
+<command>hostname</command> program.</para></note>
 
 <para>If you don't know what to answer to all the questions asked during
 the <command>make config</command> phase below, then just accept the
-defaults. This will be just fine in the majority of cases. What you're
+defaults (the build command below automates this). This will be just fine 
+in the majority of cases. What you're
 asked here is a bunch of questions about which network protocols you've
 enabled in your kernel. The default answers will enable the tools from
@@ -58,20 +74,14 @@
 protocols available.</para>
 
-<!--
-<para>This package has issues with being compiled by
-<application><acronym>GCC</acronym></application> 3.4, which we fix by
-applying the following patch:</para>
-
-<screen><userinput><command>patch -Np1 -i ../net-tools-&net-tools-version;-gcc34-3.patch</command></userinput></screen>
-
-<para>Fix an issue that arises when building against Linux 2.6:</para>
-
-<screen><userinput><command>sed -i 's@x25_address@struct &amp;@' lib/x25_sr.c</command></userinput></screen>
--->
-
 <para>Install <application>Net-tools</application> by running the
 following commands:</para>
 
-<screen><userinput><command>yes "" | make config &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../net-tools-&net-tools-version;-gcc34-3.patch &amp;&amp;
+patch -Np1 -i ../net-tools-&net-tools-version;-kernel_headers-2.patch &amp;&amp;
+yes "" | make config &amp;&amp;
+sed -i -e 's|HAVE_IP_TOOLS 0|HAVE_IP_TOOLS 1|g' \
+       -e 's|HAVE_MII 0|HAVE_MII 1|g' config.h &amp;&amp;
+sed -i -e 's|# HAVE_IP_TOOLS=0|HAVE_IP_TOOLS=1|g' \
+       -e 's|# HAVE_MII=0|HAVE_MII=1|g' config.make &amp;&amp;
 make &amp;&amp;
 make update</command></userinput></screen>
@@ -82,8 +92,12 @@
 <title>Command explanations</title>
 
-<para><command>yes "" | make config</command>:
-We skip all the questions and accept the defaults.
-</para>
-
+<para><command>yes "" | make config</command>: Piping <command>yes</command> 
+to <command>make config</command> skips the interactive configuration and
+accepts the defaults.</para>
+
+<para><command>sed -i -e ...</command>: These two <command>sed</command>s
+change the configuration files to force building the 
+<command>ipmaddr</command>, <command>iptunnel</command> and 
+<command>mii-tool</command> programs.</para>
 </sect2>
 
@@ -97,4 +111,7 @@
 <command>hostname</command>,
 <command>ifconfig</command>,
+<command>ipmaddr</command>,
+<command>iptunnel</command>,
+<command>mii-tool</command>,
 <command>nameif</command>,
 <command>netstat</command>,
@@ -137,4 +154,20 @@
 </para></sect3>
 
+<sect3><title>ipmaddr</title>
+<para><command>ipmaddr</command> 
+adds, deletes and shows an interface's multicast address.
+</para></sect3>
+
+<sect3><title>iptunnel</title>
+<para><command>iptunnel</command> 
+adds, changes, deletes and shows an interface's tunnels.  
+</para></sect3>
+
+<sect3><title>mii-tool</title>
+<para><command>mii-tool</command> 
+checks or sets the status of a network interface's Media Independent 
+Interface (<acronym>MII</acronym>) unit.
+</para></sect3>
+
 <sect3><title>nameif</title>
 <para><command>nameif</command>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6b267c3a4514ead1a7a39aa428a6da3f6239a938)
+++ introduction/welcome/changelog.xml	(revision c6286594af209840e62ad884336f04d8e89b54a3)
@@ -20,5 +20,6 @@
 
 <listitem><para>August 6th, 2004 [randy]: Updated to
-OpenLDAP-2.2.13 and Speex-1.0.4.</para></listitem>
+OpenLDAP-2.2.13 and Speex-1.0.4; added patches and modified build
+instructions for Net-tools; updated Glossary.</para></listitem>
 
 <listitem><para>August 5th, 2004 [igor]: Updated to
