diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml
index 359360c62..a6068166e 100644
--- a/appendixa/appendixa.xml
+++ b/appendixa/appendixa.xml
@@ -23,9 +23,11 @@
&aa-grep;
&aa-groff;
&aa-gzip;
+&aa-inetutils;
&aa-kbd;
&aa-less;
&aa-bootscripts;
+&aa-lfs-utils;
&aa-libtool;
&aa-lilo;
&aa-kernel;
@@ -36,7 +38,6 @@
&aa-manpages;
&aa-modutils;
&aa-ncurses;
-&aa-netkitbase;
&aa-nettools;
&aa-patch;
&aa-perl;
diff --git a/appendixa/inetutils-dep.xml b/appendixa/inetutils-dep.xml
new file mode 100644
index 000000000..39827cb75
--- /dev/null
+++ b/appendixa/inetutils-dep.xml
@@ -0,0 +1,8 @@
+
+
+
+Inetutils Installation Dependencies
+
+No dependencies checked yet.
+
+
diff --git a/appendixa/inetutils-desc.xml b/appendixa/inetutils-desc.xml
new file mode 100644
index 000000000..c2b25a6e6
--- /dev/null
+++ b/appendixa/inetutils-desc.xml
@@ -0,0 +1,64 @@
+
+
+Descriptions
+
+Last checked against version &inetutils-contversion;.
+
+Program file descriptions
+
+ftp
+ARPANET file transfer program.
+
+ping
+send ICMP_ECHO_REQUEST packets to network hosts.
+
+rcp
+remote file copy.
+
+rlogin
+remote login.
+
+rsh
+remote shell.
+
+talk
+talk to another user.
+
+telnet
+user interface to the TELNET protocol.
+
+tftp
+trivial file transfer program.
+
+whois
+client for whois directory service.
+
+ftpd
+DARPA Internet File Transfer Protocol server.
+
+inetd
+internet super-service.
+
+rexecd
+remote execution server.
+
+rlogind
+remote login server.
+
+rshd
+remote shell server.
+
+talkd
+remote user communication server.
+
+telnetd
+DARPA TELNET protocol server.
+
+tftpd
+Internet Trivial File Transfer Protocol server.
+
+uucpd
+No description available.
+
+
+
diff --git a/appendixa/inetutils-down.xml b/appendixa/inetutils-down.xml
new file mode 100644
index 000000000..41a6c0f9b
--- /dev/null
+++ b/appendixa/inetutils-down.xml
@@ -0,0 +1,9 @@
+
+
+
+Official Download Location
+
+Inetutils (&inetutils-version;):
+
+
+
diff --git a/appendixa/inetutils-shortdesc.xml b/appendixa/inetutils-shortdesc.xml
new file mode 100644
index 000000000..923a80628
--- /dev/null
+++ b/appendixa/inetutils-shortdesc.xml
@@ -0,0 +1,13 @@
+Contents of Inetutils
+
+Last checked against version &inetutils-contversion;.
+
+The Inetutils package contains network clients and servers.
+
+Inetutils installs the following:
+
+Program Files
+ftp, ping, rcp, rlogin, rsh, talk, telnet, tftp, whois, ftpd,
+inetd, rexecd, rlogind, rshd, talkd, telnetd, tftpd, uucpd
+
+
diff --git a/appendixa/inetutils.xml b/appendixa/inetutils.xml
new file mode 100644
index 000000000..0db8c088e
--- /dev/null
+++ b/appendixa/inetutils.xml
@@ -0,0 +1,10 @@
+
+Inetutils
+
+
+&aa-inetutils-down;
+&aa-inetutils-shortdesc;
+&aa-inetutils-desc;
+&aa-inetutils-dep;
+
+
diff --git a/appendixa/lfs-utils-dep.xml b/appendixa/lfs-utils-dep.xml
new file mode 100644
index 000000000..6ca1dc561
--- /dev/null
+++ b/appendixa/lfs-utils-dep.xml
@@ -0,0 +1,8 @@
+
+
+
+Lfs-Utils Installation Dependencies
+
+No dependencies checked yet.
+
+
diff --git a/appendixa/lfs-utils-desc.xml b/appendixa/lfs-utils-desc.xml
new file mode 100644
index 000000000..b9723a43d
--- /dev/null
+++ b/appendixa/lfs-utils-desc.xml
@@ -0,0 +1,18 @@
+
+
+Descriptions
+
+Last checked against version &lfs-utils-contversion;.
+
+Program file descriptions
+
+mktemp
+mktemp creates temporary files in a secure manner for use in scripts.
+
+tempfile
+tempfile creates temporary files in a less secure manner than mktemp.
+It is installed for backwards-compatibility.
+
+
+
+
diff --git a/appendixa/lfs-utils-down.xml b/appendixa/lfs-utils-down.xml
new file mode 100644
index 000000000..c3edd9887
--- /dev/null
+++ b/appendixa/lfs-utils-down.xml
@@ -0,0 +1,9 @@
+
+
+
+Official Download Location
+
+Lfs-utils (&lfs-utils-version;):
+
+
+
diff --git a/appendixa/lfs-utils-shortdesc.xml b/appendixa/lfs-utils-shortdesc.xml
new file mode 100644
index 000000000..6b8533b69
--- /dev/null
+++ b/appendixa/lfs-utils-shortdesc.xml
@@ -0,0 +1,14 @@
+Contents of Lfs-Utils
+
+Last checked against version &lfs-utils-contversion;.
+
+The Lfs-Utils package contains some miscellaneous programs used by
+various packages, but are not large enough to warrant their own
+individual package.
+
+Lfs-Utils installs the following:
+
+Program Files
+mktemp, tempfile
+
+
diff --git a/appendixa/lfs-utils.xml b/appendixa/lfs-utils.xml
new file mode 100644
index 000000000..9f929aea0
--- /dev/null
+++ b/appendixa/lfs-utils.xml
@@ -0,0 +1,11 @@
+
+Lfs-Utils
+
+
+&aa-lfs-utils-down;
+&aa-lfs-utils-shortdesc;
+&aa-lfs-utils-desc;
+&aa-lfs-utils-dep;
+
+
+
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 197d88e76..6bca90fd7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -49,6 +49,8 @@
gcc-3.2.3-mmap_test.patch
gcc-3.2.3-no_fixincludes.patch
gcc-3.2.3-specs-3.patch
+inetutils-1.4.2
+lfs-utils-0.2.1
ncurses-5.3-etip.patch
perl-5.8.0-libc.patch
tcl-8.4.2
@@ -60,6 +62,7 @@
fileutils-4.1
fileutils-4.1.patch
+netkit-base-0.17
sh-utils-2.0
sh-utils-2.0.patch
sh-utils-2.0-hostname.patch
@@ -68,6 +71,11 @@
+May 11th, 2003 (Bug #490) [winkie]: Removed Netkit-base
+0.17. Added Inetutils 1.4.2.
+
+May 11th, 2003 (Bug #493) [winkie]: Added lfs-utils-0.2.1.
+
May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses:
Fix up the symlinks so that they follow suit of other library symlinks.
No more weirdness here.
diff --git a/chapter04/inetutils.xml b/chapter04/inetutils.xml
new file mode 100644
index 000000000..5fa067fb5
--- /dev/null
+++ b/chapter04/inetutils.xml
@@ -0,0 +1,2 @@
+Inetutils (&inetutils-version;) - &inetutils-size;:
+
diff --git a/chapter04/lfs-utils.xml b/chapter04/lfs-utils.xml
new file mode 100644
index 000000000..b1ab7e72c
--- /dev/null
+++ b/chapter04/lfs-utils.xml
@@ -0,0 +1,2 @@
+Lfs-Utils (&lfs-utils-version;) - &lfs-utils-size;:
+
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index 31e839e6d..a8d7667d0 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -38,10 +38,12 @@
&c4-groff;
&c4-gzip;
&c4-gzip-patch;
+&c4-inetutils;
&c4-kbd;
&c4-kbd-patch;
&c4-less;
&c4-bootscripts;
+&c4-lfs-utils;
&c4-libtool;
&c4-lilo;
&c4-kernel;
@@ -54,7 +56,6 @@
&c4-modutils;
&c4-ncurses;
&c4-ncurses-patch;
-&c4-netkitbase;
&c4-nettools;
&c4-patch;
&c4-perl;
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index a8369c913..87c5acb2a 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -19,6 +19,7 @@
&c5-binutils-pass2;
&c5-gawk;
&c5-coreutils;
+&c5-lfs-utils;
&c5-bzip2;
&c5-gzip;
&c5-diffutils;
diff --git a/chapter05/lfs-utils-inst.xml b/chapter05/lfs-utils-inst.xml
new file mode 100644
index 000000000..5c080af8d
--- /dev/null
+++ b/chapter05/lfs-utils-inst.xml
@@ -0,0 +1,15 @@
+
+
+
+Installation of Lfs-Utils
+
+Compile the package:
+
+make
+
+And install the package:
+
+make PREFIX=/stage1 install
+
+
+
diff --git a/chapter05/lfs-utils.xml b/chapter05/lfs-utils.xml
new file mode 100644
index 000000000..b24a766c4
--- /dev/null
+++ b/chapter05/lfs-utils.xml
@@ -0,0 +1,10 @@
+
+Installing Lfs-Utils-&lfs-utils-version;
+
+
+&aa-lfs-utils-shortdesc;
+&aa-lfs-utils-dep;
+&c5-lfs-utils-inst;
+
+
+
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 1a3ad15f8..4aa5225d2 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -19,6 +19,7 @@
&c6-gcc;
&c6-coreutils;
&c6-zlib;
+&c6-lfs-utils;
&c6-findutils;
&c6-gawk;
&c6-ncurses;
@@ -31,6 +32,7 @@
&c6-flex;
&c6-gettext;
&c6-nettools;
+&c6-inetutils;
&c6-perl;
&c6-texinfo;
&c6-autoconf;
@@ -50,7 +52,6 @@
&c6-lilo;
&c6-make;
&c6-modutils;
-&c6-netkitbase;
&c6-patch;
&c6-procinfo;
&c6-procps;
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 1be2246a8..f6df24e0d 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -26,7 +26,8 @@ ln -sf /stage1/bin/mv /bin
ln -sf /stage1/bin/chmod /bin
ln -sf /stage1/bin/chgrp /bin
ln -sf /stage1/bin/sort /usr/bin
-ln -sf /stage1/bin/cmp /usr/bin
+ln -sf /stage1/bin/cmp /usr/bin
+ln -sf /stage1/bin/mktemp /usr/bin
diff --git a/chapter06/inetutils-inst.xml b/chapter06/inetutils-inst.xml
new file mode 100644
index 000000000..37cfff695
--- /dev/null
+++ b/chapter06/inetutils-inst.xml
@@ -0,0 +1,34 @@
+
+
+
+Installation of Inetutils
+
+Prepare Inetutils to be compiled:
+
+./configure --prefix=/usr --disable-syslogd \
+ --libexecdir=/usr/sbin --infodir=/usr/share/info \
+ --mandir=/usr/share/man --disable-logger
+
+The meanings of the configure options are:
+
+
+--disable-syslogd: This option
+prevents inetutils from installing the System Log Daemon, which is
+installed with the Sysklogd package.
+
+--disable-logger: This option
+prevents inetutils from installing the logger program, which is used by
+scripts to pass messages to the System Log Daemon. We do not install it
+because Util-linux installs a better version later.
+
+
+Continue with compiling the package:
+
+make
+
+Finish installing the package:
+
+make install
+
+
+
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
new file mode 100644
index 000000000..fff3638b5
--- /dev/null
+++ b/chapter06/inetutils.xml
@@ -0,0 +1,9 @@
+
+Installing Inetutils-&inetutils-version;
+
+
+&aa-inetutils-shortdesc;
+&aa-inetutils-dep;
+&c6-inetutils-inst;
+
+
diff --git a/chapter06/lfs-utils-inst.xml b/chapter06/lfs-utils-inst.xml
new file mode 100644
index 000000000..dfa022694
--- /dev/null
+++ b/chapter06/lfs-utils-inst.xml
@@ -0,0 +1,15 @@
+
+
+
+Installation of Lfs-Utils
+
+Compile the package:
+
+make
+
+And install the package:
+
+make install
+
+
+
diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml
new file mode 100644
index 000000000..f3d81c0e5
--- /dev/null
+++ b/chapter06/lfs-utils.xml
@@ -0,0 +1,9 @@
+
+Installing Lfs-Utils-&lfs-utils-version;
+
+
+&aa-lfs-utils-shortdesc;
+&aa-lfs-utils-dep;
+&c6-lfs-utils-inst;
+
+
diff --git a/entities/inetutils.ent b/entities/inetutils.ent
new file mode 100644
index 000000000..6ad9957cd
--- /dev/null
+++ b/entities/inetutils.ent
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent
new file mode 100644
index 000000000..c12638fa2
--- /dev/null
+++ b/entities/lfs-utils.ent
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/index.xml b/index.xml
index 231226eee..e138b8b58 100644
--- a/index.xml
+++ b/index.xml
@@ -62,9 +62,11 @@
+
+
@@ -75,7 +77,6 @@
-
@@ -134,9 +135,11 @@
%grep-entities;
%groff-entities;
%gzip-entities;
+%inetutils-entities;
%kbd-entities;
%kernel-entities;
%less-entities;
+%lfs-utils-entities;
%libtool-entities;
%lilo-entities;
%lockingglibc-entities;
@@ -147,7 +150,6 @@
%manpages-entities;
%modutils-entities;
%ncurses-entities;
-%netkitbase-entities;
%nettools-entities;
%patch-entities;
%perl-entities;