diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 63a895bac..64a899b9a 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -261,7 +261,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, File, Flex, Gawk, GCC, Glibc,
-         Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
+         Grep, Make, Perl, Sed, Texinfo, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a8512992d..5cdfee5d0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,604 +46,10 @@
     -->
 
     <listitem>
-      <itemizedlist>
-      <para>2021-02-20</para>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.57.1. Fixes
-          <ulink url="&lfs-ticket-root;4821">#4821</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python-3.9.2. Fixes
-          <ulink url="&lfs-ticket-root;4820">#4820</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[pierre] - Fix grub to prevent generation of a huge binary
-          blob for lzma compression. Reported on the lfs-support mailing
-          list by Frans de Boer.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2021-02-18</para>
-        <listitem>
-          <para>[bdubbs] - Fix a glibc bug that causes issues with chrooted applications. Fixes
-          <ulink url="&lfs-ticket-root;4817">#4817</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.3.0. Fixes
-          <ulink url="&lfs-ticket-root;4819">#4819</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to openssl-1.1.1j. Fixes
-          <ulink url="&lfs-ticket-root;4816">#4816</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.57.0. Fixes
-          <ulink url="&lfs-ticket-root;4815">#4815</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.10.17. Fixes
-          <ulink url="&lfs-ticket-root;4807">#4807</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2021-02-14</para>
-        <listitem>
-          <para>[renodr] - Add a command explanation for 'pwait'.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-linux-2.36.2. Fixes
-          <ulink url="&lfs-ticket-root;4812">#4812</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tar-1.34. Fixes
-          <ulink url="&lfs-ticket-root;4813">#4813</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to psmisc-23.4. Fixes
-          <ulink url="&lfs-ticket-root;4805">#4805</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to procps-ng-3.3.17. Fixes
-          <ulink url="&lfs-ticket-root;4811">#4811</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to man-db-2.9.4. Fixes
-          <ulink url="&lfs-ticket-root;4808">#4808</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to eudev-3.2.10. Fixes
-          <ulink url="&lfs-ticket-root;4810">#4810</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to elfutils-0.183. Fixes
-          <ulink url="&lfs-ticket-root;4806">#4806</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to e2fsprogs-1.46.1. Fixes
-          <ulink url="&lfs-ticket-root;4809">#4809</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.2.7. Fixes
-          <ulink url="&lfs-ticket-root;4814">#4814</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2021-02-01</para>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20210202. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to inetutils-2.0. Fixes
-          <ulink url="&lfs-ticket-root;4803">#4803</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.48. Fixes
-          <ulink url="&lfs-ticket-root;4802">#4802</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to binutils-2.36.1. Fixes
-          <ulink url="&lfs-ticket-root;4804">#4804</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.10.13. Fixes
-          <ulink url="&lfs-ticket-root;4801">#4801</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <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] - To allow building with newer version of glibc
-          than the host distribution, build a "file" executable for the
-          host before cross-compiling it.</para>
-        </listitem>
-        <listitem>
-          <para>[pierre] - Replace the relinked libctf (which may incorrectly
-          link against libz from the host distribution) with the one that
-          was linked during "make" in binutils-pass2. Thanks to Xi Ruoyao
-          for the fix.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.2.6. Fixes
-          <ulink url="&lfs-ticket-root;4800">#4800</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to glibc-2.33. Fixes
-          <ulink url="&lfs-ticket-root;4799">#4799</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Minor change to mountfs boot script. Fixes
-          <ulink url="&lfs-ticket-root;4798">#4798</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2021-02-01</para>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.2433. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20210115. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.2.5. Fixes
-          <ulink url="&lfs-ticket-root;4797">#4797</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to e2fsprogs-1.46.0. Fixes
-          <ulink url="&lfs-ticket-root;4796">#4796</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to autoconf-2.71. Fixes
-          <ulink url="&lfs-ticket-root;4795">#4795</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2021a. Fixes
-          <ulink url="&lfs-ticket-root;4793">#4793</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to perl-5.32.1. Fixes
-          <ulink url="&lfs-ticket-root;4792">#4792</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.47. Fixes
-          <ulink url="&lfs-ticket-root;4791">#4791</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bison-3.7.5. Fixes
-          <ulink url="&lfs-ticket-root;4790">#4790</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to binutils-2.36. Fixes
-          <ulink url="&lfs-ticket-root;4789">#4789</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.10.12. Fixes
-          <ulink url="&lfs-ticket-root;4786">#4786</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2020-01-16</para>
+      <para>2021-03-01</para>
       <itemizedlist>
         <listitem>
-          <para>[renodr] - Update to findutils-4.8.0. Fixes
-          <ulink url="&lfs-ticket-root;4785">#4785</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to kmod-28. Fixes
-          <ulink url="&lfs-ticket-root;4784">#4784</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to tar-1.33. Fixes
-          <ulink url="&lfs-ticket-root;4783">#4783</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to linux-5.10.7. Fixes
-          <ulink url="&lfs-ticket-root;4782">#4782</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to meson-0.56.2. Fixes
-          <ulink url="&lfs-ticket-root;4781">#4781</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to tcl-8.6.11. Fixes
-          <ulink url="&lfs-ticket-root;4780">#4780</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2021-01-13</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Fix util-linux uuidd socket path.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Remove various references to deprecated
-          /var/run, use /run instead.</para>
-        </listitem>
-        <listitem revision="sysv">
-          <para>[xry111] - Update to lfs-bootscripts-20210113.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2021-01-01</para>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.2253. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20201229. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gdbm-1.19. Fixes
-          <ulink url="&lfs-ticket-root;4779">#4779</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2020f. Fixes
-          <ulink url="&lfs-ticket-root;4777">#4777</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to man-pages-5.10. Fixes
-          <ulink url="&lfs-ticket-root;4776">#4776</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iproute2-5.10.0. Fixes
-          <ulink url="&lfs-ticket-root;4775">#4775</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to zstd-1.4.8. Fixes
-          <ulink url="&lfs-ticket-root;4774">#4774</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kbd-2.4.0. Fixes
-          <ulink url="&lfs-ticket-root;4773">#4773</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.10.4. Fixes
-          <ulink url="&lfs-ticket-root;4772">#4772</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-12-15</para>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.46. Fixes
-          <ulink url="&lfs-ticket-root;4771">#4771</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.2.4. Fixes
-          <ulink url="&lfs-ticket-root;4770">#4770</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to autoconf-2.70. Fixes
-          <ulink url="&lfs-ticket-root;4769">#4769</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to openssl-1.1.1i. Fixes
-          <ulink url="&lfs-ticket-root;4768">#4768</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python3-3.9.1. Fixes
-          <ulink url="&lfs-ticket-root;4767">#4767</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.9.14. Fixes
-          <ulink url="&lfs-ticket-root;4766">#4766</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bash-5.1 and readline-8.1. Fixes
-          <ulink url="&lfs-ticket-root;4764">#4764</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-12-07</para>
-        <listitem>
-          <para>[ken] - Patch meson-0.56.0 to correctly create pkgconfig
-          files re static libraries (re sysprof in BLFS) . Fixes
-          <ulink url="&lfs-ticket-root;4765">#4675</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-12-03</para>
-        <listitem>
-          <para>[renodr] - Update to linux-5.9.12. Fixes
-          <ulink url="&lfs-ticket-root;4763">#4673</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[renodr] - Update to bc-3.2.3. Fixes
-          <ulink url="&lfs-ticket-root;4762">#4672</ulink>.</para>
-        </listitem>
-        <listitem revision="systemd">
-          <para>[renodr] - Update to systemd-247. Fixes
-          <ulink url="&lfs-ticket-root;4745">#4745</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-12-01</para>
-        <listitem>
-          <para>[bdubbs] - Update to ninja-1.10.2. Fixes
-          <ulink url="&lfs-ticket-root;4760">#4760</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.2.1. Fixes
-          <ulink url="&lfs-ticket-root;4759">#4759</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.9.11. Fixes
-          <ulink url="&lfs-ticket-root;4758">#4758</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to automake-1.16.3. Fixes
-          <ulink url="&lfs-ticket-root;4757">#4757</ulink>.</para>
-        </listitem>
-        <listitem revision="sysv">
-          <para>[bdubbs] - Update to sysvinit-2.98. Fixes
-          <ulink url="&lfs-ticket-root;4756">#4756</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-linux-2.36.1. Fixes
-          <ulink url="&lfs-ticket-root;4755">#4755</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20201124. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.2070. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-11-15</para>
-        <listitem>
-          <para>[bdubbs] - Update to gmp-6.2.1. Fixes
-          <ulink url="&lfs-ticket-root;4754">#4754</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20201110. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to man-pages-5.09. Fixes
-          <ulink url="&lfs-ticket-root;4750">#4750</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.9.8. Fixes
-          <ulink url="&lfs-ticket-root;4749">#4749</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.45. Fixes
-          <ulink url="&lfs-ticket-root;4751">#4751</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to grep-3.6. Fixes
-          <ulink url="&lfs-ticket-root;4752">#4752</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bison-3.7.4. Fixes
-          <ulink url="&lfs-ticket-root;4753">#4753</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-11-01</para>
-        <listitem>
-          <para>[bdubbs] - Update to elfutils-0.182. Fixes
-          <ulink url="&lfs-ticket-root;4748">#4748</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.56.0. Fixes
-          <ulink url="&lfs-ticket-root;4747">#4747</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.9.2. Fixes
-          <ulink url="&lfs-ticket-root;4746">#4746</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mpc-1.2.1. Fixes
-          <ulink url="&lfs-ticket-root;4744">#4744</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to less-563. Fixes
-          <ulink url="&lfs-ticket-root;4743">#4743</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2020d. Fixes
-          <ulink url="&lfs-ticket-root;4742">#4742</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem revision="sysv">
-      <itemizedlist>
-      <para>2020-10-19</para>
-        <listitem>
-          <para>[dj] - Update to lfs-bootscripts-20201019.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-10-20</para>
-        <listitem>
-          <para>[bdubbs] - Update to iproute2-5.9.0. Fixes
-          <ulink url="&lfs-ticket-root;4739">#4739</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2020c. Fixes
-          <ulink url="&lfs-ticket-root;4741">#4741</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.9.1. Fixes
-          <ulink url="&lfs-ticket-root;4740">#4740</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-10-15</para>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20201012. Addresses
-          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.1845. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bison-3.7.3. Fixes
-          <ulink url="&lfs-ticket-root;4738">#4738</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2020b. Fixes
-          <ulink url="&lfs-ticket-root;4737">#4737</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.44. Fixes
-          <ulink url="&lfs-ticket-root;4735">#4735</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python-3.9. Fixes
-          <ulink url="&lfs-ticket-root;4736">#4736</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to expat-2.2.10. Fixes
-          <ulink url="&lfs-ticket-root;4734">#4734</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-3.1.6. Fixes
-          <ulink url="&lfs-ticket-root;4732">#4732</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.9. Fixes
-          <ulink url="&lfs-ticket-root;4733">#4733</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-10-01</para>
-        <listitem>
-          <para>[bdubbs] - Update to grep-3.5. Fixes
-          <ulink url="&lfs-ticket-root;4731">#4731</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python-3.8.6. Fixes
-          <ulink url="&lfs-ticket-root;4730">#4730</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to openssl-1.1.1h. Fixes
-          <ulink url="&lfs-ticket-root;4729">#4729</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to binutils-2.35.1. Fixes
-          <ulink url="&lfs-ticket-root;4728">#4728</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.8.12. Fixes
-          <ulink url="&lfs-ticket-root;4727">#4727</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-09-27</para>
-        <listitem>
-           <para>[bdubbs] - Add autoconf-2.69-consolidated_fixes-1.patch
-           which allows autoconf tests to pass.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-09-15</para>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.8.9. Fixes
-          <ulink url="&lfs-ticket-root;4723">#4723</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <itemizedlist>
-      <para>2020-09-02</para>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.8.5. Fixes
-          <ulink url="&lfs-ticket-root;4721">#4721</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to ninja-1.10.1. Fixes
-          <ulink url="&lfs-ticket-root;4719">#4719</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to mpc-1.2.0. Fixes
-          <ulink url="&lfs-ticket-root;4717">#4717</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.55.1. Fixes
-          <ulink url="&lfs-ticket-root;4716">#4716</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.43. Fixes
-          <ulink url="&lfs-ticket-root;4715">#4715</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2020-09-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - LFS-10.0 released.</para>
+          <para>[bdubbs] - LFS-10.1 released.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index cf6da8531..b44d74e76 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -36,24 +36,24 @@
     <!--<listitem>
       <para>Attr-&attr-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Automake-&automake-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Bash &bash-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Bc &bc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Bison-&bison-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bzip2-&bzip2-version;</para>
     </listitem>-->
@@ -72,24 +72,24 @@
     <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
-    </listitem>
-    <listitem revision="sysv">
+    </listitem>-->
+    <!--<listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
        <para>Expat-&expat-version;</para>
-    </listitem>
-    <!-- <listitem>
+    </listitem>-->
+    <!--<listitem>
        <para>Expect-&expect-version;</para>
     </listitem>-->
     <!--<listitem>
        <para>File-&file-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Findutils-&findutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Flex-&flex-version;</para>
     </listitem>-->
@@ -99,24 +99,24 @@
     <!--<listitem>
        <para>GCC-&gcc-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
        <para>GDBM-&gdbm-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>GMP-&gmp-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Grep-&grep-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Groff-&groff-version;</para>
     </listitem>-->
@@ -126,36 +126,36 @@
     <!--<listitem>
       <para>Gzip-&gzip-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>IANA-Etc-&iana-etc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Inetutils-&inetutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>IPRoute2-&iproute2-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Kbd-&kbd-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Kmod-&kmod-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Less-&less-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Libcap-&libcap-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Libffi-&libffi-version;</para>
     </listitem>-->
@@ -165,57 +165,57 @@
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Make-&make-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Man-DB-&man-db-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Man-pages-&man-pages-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Meson-&meson-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>MPC-&mpc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>MPFR-&mpfr-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Ncurses-&ncurses-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Ninja-&ninja-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Openssl-&openssl-version;</para>
-    </listitem>
-    <!-- <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Perl-&perl-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Pkg-config-&pkgconfig-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Procps-ng-&procps-ng-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Psmisc-&psmisc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Python-&python-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Readline-&readline-version;</para>
     </listitem>-->
@@ -228,30 +228,30 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <listitem revision="systemd">
+    <!--<listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>
-    <listitem revision="sysv">
+    </listitem>-->
+    <!--<listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Tar-&tar-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Tcl-&tcl-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Texinfo-&texinfo-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Tzdata-&tzdata-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Util-Linux-&util-linux-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Vim-&vim-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
@@ -261,9 +261,9 @@
     <!--<listitem>
       <para>Zlib-&zlib-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Zstd-&zstd-version;</para>
-    </listitem>
+    </listitem>-->
   </itemizedlist>
 
   <!--<itemizedlist>
@@ -280,10 +280,10 @@
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <!--<listitem>
       <para>meson-0.56.0-upstream_fix-1.patch</para>
-   </listitem>-->
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>systemd-247-upstream_fixes-1.patch</para>
-    </listitem>
+    </listitem>-->
 
   </itemizedlist>
 
@@ -291,9 +291,9 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <listitem>
+    <!--<listitem>
       <para>bash-5.0-upstream_fixes-1.patch</para>
-    </listitem>
+    </listitem>-->
 
   </itemizedlist>
 
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index 9b184c9d8..611967cf9 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -75,24 +75,9 @@
 
 <screen><userinput>logout</userinput></screen>
 
-  <para>Then unmount the virtual file systems:</para>
+  <para>Unmount the LFS file system hierarchy:</para>
 
-<screen><userinput>umount -v $LFS/dev/pts
-umount -v $LFS/dev
-umount -v $LFS/run
-umount -v $LFS/proc
-umount -v $LFS/sys</userinput></screen>
-
-  <para>If multiple partitions were created, unmount the other
-  partitions before unmounting the main one, like this:</para>
-
-<screen role="nodump"><userinput>umount -v $LFS/usr
-umount -v $LFS/home
-umount -v $LFS</userinput></screen>
-
-  <para>Unmount the LFS file system itself:</para>
-
-<screen><userinput>umount -v $LFS</userinput></screen>
+<screen><userinput>umount -Rv $LFS</userinput></screen>
 
   <para>Now, reboot the system with:</para>
 
diff --git a/general.ent b/general.ent
index 5ef641cfa..54b98a042 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20210220">
+<!ENTITY version         "SVN-20210301">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20210220-systemd">
+<!ENTITY versiond        "20210301-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 20th, 2021">
+<!ENTITY releasedate     "March 1st, 2021">
 
 <!ENTITY copyrightdate   "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->
 
@@ -40,12 +40,11 @@
 <!ENTITY before          "Must be installed before">
 <!ENTITY external        "Optional dependencies">
                          
-<!ENTITY gnu             "http://ftp.gnu.org/gnu/">
-<!ENTITY gnu-software    "http://www.gnu.org/software/">
-<!ENTITY alpha-gnu       "http://alpha.gnu.org/gnu/">
+<!ENTITY gnu             "https://ftp.gnu.org/gnu/">
+<!ENTITY gnu-software    "https://www.gnu.org/software/">
 <!ENTITY kernel          "https://www.kernel.org/pub/">
 <!ENTITY sourceforge     "https://prdownloads.sourceforge.net/">
-<!ENTITY savannah        "http://download.savannah.gnu.org">
+<!ENTITY savannah        "https://download.savannah.gnu.org">
 <!ENTITY savannah-nongnu "https://savannah.nongnu.org">
 <!ENTITY github          "https://github.com">
 
diff --git a/packages.ent b/packages.ent
index 2f06fb564..9b2a0161e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -91,7 +91,7 @@
 <!ENTITY bzip2-size "792 KB">
 <!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz">
 <!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5">
-<!ENTITY bzip2-home " ">
+<!ENTITY bzip2-home "https://sourceware.org/bzip2/">
 <!ENTITY bzip2-fin-du "7.5 MB">
 <!ENTITY bzip2-fin-sbu "less than 0.1 SBU">
 
@@ -151,7 +151,7 @@
 <!ENTITY elfutils-size "8,896 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
 <!ENTITY elfutils-md5 "6f58aa1b9af1a5681b1cbf63e0da2d67">
-<!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">
+<!ENTITY elfutils-home "https://sourceware.org/elfutils/">
 <!ENTITY elfutils-fin-du "121 MB">
 <!ENTITY elfutils-fin-sbu "0.9 SBU">
 
@@ -363,7 +363,7 @@
 <!ENTITY kbd-size "1,095 KB">
 <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz">
 <!ENTITY kbd-md5 "3cac5be0096fcf7b32dcbd3c53831380">
-<!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd">
+<!ENTITY kbd-home "https://kbd-project.org/">
 <!ENTITY kbd-fin-du "33 MB">
 <!ENTITY kbd-fin-sbu "0.1 SBU">
 
@@ -377,9 +377,9 @@
 
 <!ENTITY less-version "563">
 <!ENTITY less-size "328 KB">
-<!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
+<!ENTITY less-url "https://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
 <!ENTITY less-md5 "1ee44fa71447a845f6eef5b3f38d2781">
-<!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
+<!ENTITY less-home "https://www.greenwoodsoftware.com/less/">
 <!ENTITY less-fin-du "4.1 MB">
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
@@ -498,7 +498,7 @@
 
 <!ENTITY mpfr-version "4.1.0">
 <!ENTITY mpfr-size "1,490 KB">
-<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
+<!ENTITY mpfr-url "https://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
 <!ENTITY mpfr-md5 "bdd3d5efba9c17da8d83a35ec552baef">
 <!ENTITY mpfr-home "https://www.mpfr.org/">
 <!ENTITY mpfr-fin-du "38 MB">
@@ -574,7 +574,7 @@
 <!ENTITY psmisc-size "362 KB">
 <!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz">
 <!ENTITY psmisc-md5 "8114cd4489b95308efe2509c3a406bbf">
-<!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
+<!ENTITY psmisc-home "https://gitlab.com/psmisc/psmisc">
 <!ENTITY psmisc-fin-du "5.7 MB">
 <!ENTITY psmisc-fin-sbu "less than 0.1 SBU">
 
@@ -623,9 +623,9 @@
 
 <!ENTITY sysklogd-version "1.5.1">
 <!ENTITY sysklogd-size "88 KB">
-<!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
+<!ENTITY sysklogd-url "https://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
 <!ENTITY sysklogd-md5 "c70599ab0d037fde724f7210c2c8d7f8">
-<!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
+<!ENTITY sysklogd-home "https://www.infodrom.org/projects/sysklogd/">
 <!ENTITY sysklogd-fin-du "0.6 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
@@ -649,7 +649,7 @@
 <!ENTITY sysvinit-size "125 KB">
 <!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
 <!ENTITY sysvinit-md5 "e3254f7622ea5cf2322b1b386a98ba59">
-<!ENTITY sysvinit-home "https://savannah.nongnu.org/projects/sysvinit">
+<!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
 <!ENTITY sysvinit-fin-du "1.4 MB">
 <!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
 
@@ -702,7 +702,7 @@
 <!ENTITY util-linux-size "5,223 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
 <!ENTITY util-linux-md5 "f78419af679ac9678190ad961eb3cf27">
-<!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
+<!ENTITY util-linux-home "http://freshmeat.sourceforge.net/projects/util-linux">
 <!ENTITY util-linux-tmp-du "134 MB">
 <!ENTITY util-linux-tmp-sbu "0.7 SBU">
 <!ENTITY util-linux-fin-du "262 MB">