diff --git a/appendixa/findutils-dep.xml b/appendixa/findutils-dep.xml
index 419169099..1539cb6d7 100644
--- a/appendixa/findutils-dep.xml
+++ b/appendixa/findutils-dep.xml
@@ -1,3 +1,5 @@
+
+
Findutils Installation Dependencies
diff --git a/appendixa/findutils-desc.xml b/appendixa/findutils-desc.xml
index c65d63def..c74dcb11d 100644
--- a/appendixa/findutils-desc.xml
+++ b/appendixa/findutils-desc.xml
@@ -1,12 +1,10 @@
-Contents of Findutils
+
+
+Descriptions
Last checked against version &findutils-contversion;.
-Program Files
-bigram, code, find, frcode, locate, updatedb and
-xargs
-
-Descriptions
+Program files descriptions
bigram
bigram is used together with code to produce older-style locate
diff --git a/appendixa/findutils-shortdesc.xml b/appendixa/findutils-shortdesc.xml
new file mode 100644
index 000000000..db05045b5
--- /dev/null
+++ b/appendixa/findutils-shortdesc.xml
@@ -0,0 +1,17 @@
+Contents of Findutils
+
+Last checked against version &findutils-contversion;.
+
+The Findutils package contains programs to find files, either
+on-the-fly (by doing a live recursive search through directories and only
+showing files that match the specifications) or by searching through a
+database.
+
+Findutils installs the following:
+
+Program Files
+bigram, code, find, frcode, locate, updatedb and
+xargs
+
+
+
diff --git a/appendixa/findutils.xml b/appendixa/findutils.xml
index 7dcc9e45e..7d9b40e6e 100644
--- a/appendixa/findutils.xml
+++ b/appendixa/findutils.xml
@@ -3,6 +3,7 @@
&aa-findutils-down;
+&aa-findutils-shortdesc;
&aa-findutils-desc;
&aa-findutils-dep;
diff --git a/chapter05/findutils-exp.xml b/chapter05/findutils-exp.xml
deleted file mode 100644
index 174cf2db7..000000000
--- a/chapter05/findutils-exp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-Command explanations
-
-patch -Np1 -i ../findutils-&findutils-patch-version;.patch: This
-patch is to fix some compilation errors by
-avoiding a variable conflict and changing some bad syntax.
-
-
-
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index d49a3db16..df3da659a 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -1,15 +1,20 @@
+
+
Installing Findutils
-This package requires its patch to be applied before you can
-install it.
+The Findutils package is quite old and it has problems compiling
+against newer Glibc versions (Glibc-2.0.x and up). You need to apply the
+patch that fixes some variable conflicts you'd otherwise end up
+with:
-Install Findutils by running the following commands:
+patch -Np1 -i ../findutils-&findutils-patch-version;.patch
-patch -Np1 -i ../findutils-&findutils-patch-version;.patch &&
-CPPFLAGS="-Dre_max_failures=re_max_failures2" \
- LDFLAGS="-static" ./configure --prefix=$LFS/static &&
-make &&
+Install Findutils by running the following:
+
+CPPFLAGS="-Dre_max_failures=re_max_failures2" \
+ LDFLAGS="-static" ./configure --prefix=$LFS/static
+make
make install
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index dad29df27..0ecaae958 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -5,10 +5,9 @@
Estimated build time: &findutils-time-static;
Estimated required disk space: &findutils-compsize-static;
-&c5-findutils-inst;
-&c5-findutils-exp;
-&aa-findutils-desc;
+&aa-findutils-shortdesc;
&aa-findutils-dep;
+&c5-findutils-inst;
diff --git a/entities/findutils.ent b/entities/findutils.ent
index 04b8f24ca..45c581199 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -11,6 +11,7 @@
+