Index: appendices/dependencies.xml
===================================================================
--- appendices/dependencies.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ appendices/dependencies.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -781,5 +781,5 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Binutils, IProute2, Kbd, Kmod, and Man-DB</seg>
         </seglistitem>
       </segmentedlist>
@@ -838,5 +838,5 @@
          <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
          Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar,
-         and Texinfo</seg>
+         Texinfo, and Zstd</seg>
         </seglistitem>
       </segmentedlist>
@@ -2787,5 +2787,5 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>GCC</seg>
         </seglistitem>
       </segmentedlist>
Index: chapter05/chapter05.xml
===================================================================
--- chapter05/chapter05.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter05/chapter05.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -30,6 +30,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.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="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter06/chapter06.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -29,8 +29,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zstd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
   <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="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
@@ -50,5 +52,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.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="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
@@ -79,5 +80,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zstd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter06/coreutils.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -117,5 +117,5 @@
     user <systemitem class="username">tester</systemitem> a part of it:</para>
 
-<screen><userinput remap="test">echo "tester:x:1000:nogroup" &gt;&gt; /etc/group</userinput></screen>
+<screen><userinput remap="test">echo "dummy:x:1000:tester" &gt;&gt; /etc/group</userinput></screen>
 
     <para>Fix some of the permissions so that the non-root user can compile and
@@ -133,9 +133,9 @@
     passes if run at the end of this chapter.  The test program tty.sh is
     also known to fail.</para>
+-->
 
     <para>Remove the temporary group:</para>
 
 <screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
--->
     <para>Install the package:</para>
 
Index: chapter06/createfiles.xml
===================================================================
--- chapter06/createfiles.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter06/createfiles.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -369,5 +369,5 @@
 
 <screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
-echo "tester:x:101:dummy" &gt;&gt; /etc/group
+echo "tester:x:101:" &gt;&gt; /etc/group
 install -o tester -d /home/tester</userinput></screen>
 
Index: chapter06/kbd.xml
===================================================================
--- chapter06/kbd.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter06/kbd.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -61,5 +61,5 @@
     <para>Prepare Kbd for compilation:</para>
 
-<screen><userinput remap="configure">PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr --disable-vlock</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-vlock</userinput></screen>
 
     <variablelist>
Index: chapter06/make.xml
===================================================================
--- chapter06/make.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter06/make.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -57,5 +57,5 @@
     results, issue:</para>
 
-<screen><userinput remap="test">make PERL5LIB=$PWD/tests/ check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
Index: chapter06/revisedchroot.xml
===================================================================
--- chapter06/revisedchroot.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter06/revisedchroot.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -52,4 +52,5 @@
 
 <screen><userinput>rm -f /usr/lib/lib{bfd,opcodes}.a
+rm -f /usr/lib/libctf{,-nobfd}.a
 rm -f /usr/lib/libbz2.a
 rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a
Index: chapter06/sed.xml
===================================================================
--- chapter06/sed.xml	(revision 777c890b8ca26c4266e14e7f89c6be301da05c42)
+++ chapter06/sed.xml	(revision 0e9d60ee6a00514bce8de08d5c9783df5a49c87a)
@@ -57,5 +57,5 @@
 
 <screen><userinput remap="test">chown -Rv tester .
-su -c "PATH=$PATH make check"</userinput></screen>
+su tester -c "PATH=$PATH make check"</userinput></screen>
 
     <para>Install the package and its documentation:</para>
