diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c27fe45f9..c87aba039 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,6 +27,10 @@
+May 26th, 2002 [gerard]: Chapter 05+06 - Binutils: Removed
+the tooldir setting from chapter 05-binutils, moved its description to
+chapter 06-binutils.
+
May 26th, 2002 [gerard]: Chapter 05 - Gawk & Findutils:
simplified the installation by removing the libexecdir modifications. We
can live with a
diff --git a/chapter05/binutils-exp.xml b/chapter05/binutils-exp.xml
index 1f631d55f..a1a226d35 100644
--- a/chapter05/binutils-exp.xml
+++ b/chapter05/binutils-exp.xml
@@ -14,14 +14,5 @@ statically.
LDFLAGS=-all-static: Setting the variable LDFLAGS
to the value -all-static causes binutils to be linked statically.
-tooldir=$LFS/usr: Normally, the tooldir (the
-directory where the executables from binutils end up in) is set to
-$(exec_prefix)/$(target_alias) which expands into, for example,
-/usr/i686-pc-linux-gnu. Since we only build for our own system, we don't
-need this target specific directory in $LFS/usr. That setup would be used
-if the system was used to cross-compile (for example
-compiling a package on the Intel machine that generates code that can be
-executed on Apple PowerPC machines).
-
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 26d1fb232..460b8c8f3 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -14,8 +14,8 @@ warned.
mkdir ../binutils-build &&
cd ../binutils-build &&
../binutils-&binutils-version;/configure --prefix=$LFS/static --disable-nls &&
-make tooldir=$LFS/static LDFLAGS=-all-static &&
-make tooldir=$LFS/static install
+make LDFLAGS=-all-static &&
+make install
diff --git a/chapter06/binutils-exp.xml b/chapter06/binutils-exp.xml
index fb149b60f..1f171f937 100644
--- a/chapter06/binutils-exp.xml
+++ b/chapter06/binutils-exp.xml
@@ -1,6 +1,15 @@
Command explanations
+tooldir=/usr: Normally, the tooldir (the
+directory where the executables from binutils end up in) is set to
+$(exec_prefix)/$(target_alias) which expands into, for example,
+/usr/i686-pc-linux-gnu. Since we only build for our own system, we don't
+need this target specific directory in /usr. That setup would be used
+if the system was used to cross-compile (for example
+compiling a package on the Intel machine that generates code that can be
+executed on Apple PowerPC machines).
+
make tooldir=/usr install-info: This will
install binutil's info pages.