Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/alpha-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ 	(revision )
@@ -1,220 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Inetutils package contains programs for basic networking.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <para os="p1">Not all programs that come with Inetutils will be installed.
-    However, the Inetutils build system will insist on installing all the
-    man pages anyway. The following patch will correct this
-    situation:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
-
-    <para os="a">Prepare Inetutils for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
-    --localstatedir=/var --disable-logger --disable-syslogd \
-    --disable-whois --disable-servers</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--disable-logger</parameter></term>
-        <listitem>
-          <para>This option prevents Inetutils from installing the
-          <command>logger</command> program, which is used by scripts to
-          pass messages to the System Log Daemon. Do not install it because
-          Util-linux-ng installs a better version later.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-syslogd</parameter></term>
-        <listitem>
-          <para>This option prevents Inetutils from installing the System Log
-          Daemon, which is installed with the Sysklogd package.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-whois</parameter></term>
-        <listitem>
-          <para>This option disables the building of the Inetutils
-          <command>whois</command> client, which is out of date.
-          Instructions for a better <command>whois</command> client are
-          in the CBLFS book.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-servers</parameter></term>
-        <listitem>
-          <para>This disables the installation of the various network
-          servers included as part of the Inetutils package. These servers are
-          deemed not appropriate in a basic CLFS system.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>ping</command> and <command>ping6</command>
-     programs to their FHS-compliant place:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/ping{,6} /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-inetutils" role="content">
-    <title>Contents of Inetutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>ftp, ifconfig, ping, ping6, rcp, rlogin, rsh, talk, telnet, and tftp</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ftp">
-        <term><command>ftp</command></term>
-        <listitem>
-          <para>Is the file transfer protocol program</para>
-          <indexterm zone="ch-system-inetutils ftp">
-            <primary sortas="b-ftp">ftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifconfig">
-        <term><command>ifconfig</command></term>
-        <listitem>
-          <para>Utility for configuring network interfaces</para>
-          <indexterm zone="ch-system-inetutils ifconfig">
-            <primary sortas="b-ifconfig">ifconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ping">
-        <term><command>ping</command></term>
-        <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take. This is the IPV4 version</para>
-          <indexterm zone="ch-system-inetutils ping">
-            <primary sortas="b-ping">ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ping6">
-        <term><command>ping6</command></term>
-        <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take. This is the IPV6 version</para>
-          <indexterm zone="ch-system-inetutils ping6">
-            <primary sortas="b-ping6">ping6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcp">
-        <term><command>rcp</command></term>
-        <listitem>
-          <para>Performs remote file copy</para>
-          <indexterm zone="ch-system-inetutils rcp">
-            <primary sortas="b-rcp">rcp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rlogin">
-        <term><command>rlogin</command></term>
-        <listitem>
-          <para>Performs remote login</para>
-          <indexterm zone="ch-system-inetutils rlogin">
-            <primary sortas="b-rlogin">rlogin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rsh">
-        <term><command>rsh</command></term>
-        <listitem>
-          <para>Runs a remote shell</para>
-          <indexterm zone="ch-system-inetutils rsh">
-            <primary sortas="b-rsh">rsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="talk">
-        <term><command>talk</command></term>
-        <listitem>
-          <para>Is used to chat with another user</para>
-          <indexterm zone="ch-system-inetutils talk">
-            <primary sortas="b-talk">talk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telnet">
-        <term><command>telnet</command></term>
-        <listitem>
-          <para>An interface to the TELNET protocol</para>
-          <indexterm zone="ch-system-inetutils telnet">
-            <primary sortas="b-telnet">telnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tftp">
-        <term><command>tftp</command></term>
-        <listitem>
-          <para>A trivial file transfer program</para>
-          <indexterm zone="ch-system-inetutils tftp">
-            <primary sortas="b-tftp">tftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/iputils.xml
===================================================================
--- BOOK/final-system/common/iputils.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
+++ BOOK/final-system/common/iputils.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-iputils" role="wrap">
+  <?dbhtml filename="iputils.html"?>
+
+  <title>IPutils-&iputils-version;</title>
+
+  <indexterm zone="ch-system-iputils">
+    <primary sortas="a-IPutils">IPutils</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The IPutils package contains programs for basic networking.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of IPutils</title>
+
+    <para os="p1">IPutils has various issues addressed by the following patch:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&iputils-fixes-patch;</userinput></screen>
+
+    <para os="a">Compile the package:</para>
+
+<screen os="b"><userinput>make</userinput></screen>
+
+    <para os="c">This package does not come with a test suite.</para>
+
+    <para os="d">Install the package:</para>
+
+<screen os="e"><userinput>cp -v ping{,6} /bin
+cp -v arpping /usr/bin
+cp -v tracepath /usr/bin
+cp -v trace{path,route}6 /usr/bin</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-iputils" role="content">
+    <title>Contents of iputils</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>arping, ping, ping6, tracepath, tracepatch6, and traceroute6</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ping">
+        <term><command>ping</command></term>
+        <listitem>
+          <para>Sends echo-request packets and reports how long the replies
+          take. This is the IPV4 version</para>
+          <indexterm zone="ch-system-iputils ping">
+            <primary sortas="b-ping">ping</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ping6">
+        <term><command>ping6</command></term>
+        <listitem>
+          <para>Sends echo-request packets and reports how long the replies
+          take. This is the IPV6 version</para>
+          <indexterm zone="ch-system-iputils ping6">
+            <primary sortas="b-ping6">ping6</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/mips-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/mips64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -82,5 +82,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
Index: BOOK/final-system/multilib/inetutils.xml
===================================================================
--- BOOK/final-system/multilib/inetutils.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64 --libexecdir=/usr/sbin \
-    --localstatedir=/var --disable-logger --disable-syslogd \
-    --disable-whois --disable-servers</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(id('contents-inetutils'))"/>
-
-</sect1>
Index: BOOK/final-system/multilib/iputils.xml
===================================================================
--- BOOK/final-system/multilib/iputils.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
+++ BOOK/final-system/multilib/iputils.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-iputils" role="wrap">
+  <?dbhtml filename="iputils.html"?>
+
+  <title>IPutils-&iputils-version;</title>
+
+  <indexterm zone="ch-system-iputils">
+    <primary sortas="a-IPutils">IPutils</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/iputils.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of IPutils</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iputils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iputils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iputils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iputils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iputils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/iputils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/iputils.xml"
+  xpointer="xpointer(id('contents-iputils'))"/>
+
+</sect1>
Index: BOOK/final-system/native-chapter.xml
===================================================================
--- BOOK/final-system/native-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/native-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/native64-chapter.xml
===================================================================
--- BOOK/final-system/native64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/native64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -67,5 +67,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/ppc-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/ppc64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -67,5 +67,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/sparc-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/sparc64-64/inetutils.xml
===================================================================
--- BOOK/final-system/sparc64-64/inetutils.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(id('contents-inetutils'))"/>
-
-</sect1>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/sparc64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -67,5 +67,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
Index: BOOK/final-system/sparc64/inetutils.xml
===================================================================
--- BOOK/final-system/sparc64/inetutils.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(id('contents-inetutils'))"/>
-
-</sect1>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/x86-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -51,5 +51,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/final-system/x86_64-chapter.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -67,5 +67,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/introduction/common/changelog.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -49,4 +49,8 @@
         <listitem>
           <para>[Jim] - Added DHCPCD 4.0.7 to book.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Replaced Inetutils 1.6 with IP Utils 20071127. Fixes numerous
+          compile issues of common network utilities on all architectures.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/materials/common/packages.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -259,13 +259,4 @@
 
     <varlistentry>
-      <term>Inetutils (&inetutils-version;) - <token>&inetutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&inetutils-home;"/></para>
-        <para>Download: <ulink url="&inetutils-url;"/></para>
-        <para>MD5 sum: <literal>&inetutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
@@ -277,4 +268,13 @@
 
     <varlistentry>
+      <term>IPutils (&iputils-version;) - <token>&iputils-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&iputils-home;"/></para>
+        <para>Download: <ulink url="&iputils-url;"/></para>
+        <para>MD5 sum: <literal>&iputils-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
       <listitem>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/materials/common/patches.xml	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -173,9 +173,9 @@
 
     <varlistentry>
-      <term>Inetutils No-Server-Man-Pages Patch - <token>&inetutils-man_pages-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&inetutils-man_pages-patch;"/></para>
-        <para>MD5 sum: <literal>&inetutils-man_pages-patch-md5;</literal></para>
+      <term>IPUtils Fixes Patch - <token>&iputils-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&iputils-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&iputils-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/packages.ent	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -222,9 +222,9 @@
 <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc">
 
-<!ENTITY inetutils-version "1.6">
-<!ENTITY inetutils-size "1,644 KB">
-<!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.gz">
-<!ENTITY inetutils-md5 "23cc24bc77751bf77d50a07a7395f9b3">
-<!ENTITY inetutils-home "&gnu-software;inetutils">
+<!ENTITY iputils-version "s20071127">
+<!ENTITY iputils-size "92 KB">
+<!ENTITY iputils-url "http://www.skbuff.net/iputils/iputils-&iputils-version;.tar.bz2">
+<!ENTITY iputils-md5 "12245e9927d60ff5cf4a99d265bcb7d3">
+<!ENTITY iputils-home "http://www.linuxfoundation.org/en/Net:Iputils">
 
 <!ENTITY iproute2-version "2.6.26">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision a8a8b9ededf6612fe0f9f455ca335907d3092b2b)
+++ BOOK/patches.ent	(revision b609dca2ec1147966d0b9e81273dfebc49f54728)
@@ -73,7 +73,7 @@
 <!ENTITY grep-i18n-patch-size "28 KB">
 
-<!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch">
-<!ENTITY inetutils-man_pages-patch-md5 "ceddba1a8db7f18568a3832c11a69dff">
-<!ENTITY inetutils-man_pages-patch-size "4 KB">
+<!ENTITY iputils-fixes-patch "iputils-&iputils-version;-fixes-1.patch">
+<!ENTITY iputils-fixes-patch-md5 "16d3ac896afe31c0188274930c1dd90e">
+<!ENTITY iputils-fixes-patch-size "4 KB">
 
 <!ENTITY linux-serial-patch "linux-&linux-version;-serial_h_fix-1.patch">
