Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 428695cb4a5b0a2b0b52f4efaa971426943a2e16)
+++ chapter01/changelog.xml	(revision df2e99e94db203e66a798ef7f070d6e96560e8e7)
@@ -47,4 +47,15 @@
       <para>2021-02-02</para>
         <listitem>
+          <para>[pierre] - Move tcl, expect, and dejagnu just before binutils
+          in chapter 8: this allows to build them against chapter 8
+          glibc.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Tweaks to allow building with glibc-2.33:
+          build a "file" executable for the host before cross-compiling
+          it; replace the relinked libctf with the one that was linked
+          during "make" in binutils-pass2.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to bc-3.2.6. Fixes
           <ulink url="&lfs-ticket-root;4800">#4800</ulink>.</para>
Index: chapter06/binutils-pass2.xml
===================================================================
--- chapter06/binutils-pass2.xml	(revision 428695cb4a5b0a2b0b52f4efaa971426943a2e16)
+++ chapter06/binutils-pass2.xml	(revision df2e99e94db203e66a798ef7f070d6e96560e8e7)
@@ -88,5 +88,6 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install
+install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
 
     <para>
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision 428695cb4a5b0a2b0b52f4efaa971426943a2e16)
+++ chapter06/file.xml	(revision df2e99e94db203e66a798ef7f070d6e96560e8e7)
@@ -44,4 +44,14 @@
     <title>Installation of File</title>
 
+    <para>The build host <quote>file</quote> command iwith the same version as
+    the one we are building is needed for building the signature file. Run the
+    following commands to build it:</para>
+
+<screen><userinput remap="pre">mkdir build
+pushd build
+../configure
+make
+popd</userinput></screen>
+
     <para>Prepare File for compilation:</para>
 
@@ -55,5 +65,5 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make FILE_COMPILE=$(pwd)/build/src/file</userinput></screen>
 
     <para>Install the package:</para>
Index: chapter08/chapter08.xml
===================================================================
--- chapter08/chapter08.xml	(revision 428695cb4a5b0a2b0b52f4efaa971426943a2e16)
+++ chapter08/chapter08.xml	(revision df2e99e94db203e66a798ef7f070d6e96560e8e7)
@@ -15,9 +15,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-pages.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
@@ -31,4 +26,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
Index: chapter08/glibc.xml
===================================================================
--- chapter08/glibc.xml	(revision 428695cb4a5b0a2b0b52f4efaa971426943a2e16)
+++ chapter08/glibc.xml	(revision df2e99e94db203e66a798ef7f070d6e96560e8e7)
@@ -127,5 +127,5 @@
 
 <!-- Use remap="make" here to work around a jhalfs issue. -->
-<screen><userinput remap="make">case $(uname -m) in
+<!--<screen><userinput remap="make">case $(uname -m) in
   i?86)   ln -sfnv $PWD/elf/ld-linux.so.2        /lib ;;
   x86_64) ln -sfnv $PWD/elf/ld-linux-x86-64.so.2 /lib ;;
@@ -135,5 +135,5 @@
     stage of building in the chroot environment.  It will be overwritten
     in the install phase below.</para></note>
-
+-->
 <screen><userinput remap="test">make check</userinput></screen>
 
Index: chapter08/tcl.xml
===================================================================
--- chapter08/tcl.xml	(revision 428695cb4a5b0a2b0b52f4efaa971426943a2e16)
+++ chapter08/tcl.xml	(revision df2e99e94db203e66a798ef7f070d6e96560e8e7)
@@ -46,9 +46,8 @@
 
     <para>This package and the next two (Expect and DejaGNU) are
-    installed to support running the test suites for GCC and binutils and other
+    installed to support running the test suites for binutils and GCC and other
     packages.  Installing three packages for testing purposes may seem
     excessive, but it is very reassuring, if not essential, to know that the
-    most important tools are working properly. These packages are required
-    to run the test suites in this chapter.</para>
+    most important tools are working properly.</para>
 
 <!--    <para>Note that the Tcl package used here is a minimal version needed
