Index: appendices/dependencies.xml
===================================================================
--- appendices/dependencies.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ appendices/dependencies.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -719,5 +719,7 @@
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>
+            <ulink url="&blfs-root;/view/stable/general/libseccomp.html">Libseccomp</ulink>
+          </seg>
         </seglistitem>
       </segmentedlist>
@@ -1117,5 +1119,5 @@
 
         <seglistitem>
-          <seg>Ghostscript</seg>
+          <seg>Ghostscript and uchardet</seg>
         </seglistitem>
       </segmentedlist>
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter01/changelog.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -45,4 +45,132 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-03-26</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to openssl-1.1.1k (Security Update). Fixes
+          <ulink url="&lfs-ticket-root;4838">#4838</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to attr-2.5.1. Fixes
+          <ulink url="&lfs-ticket-root;4833">#4833</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to linux-5.11.10. Fixes
+          <ulink url="&lfs-ticket-root;4834">#4834</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to bc-3.3.4. Fixes
+          <ulink url="&lfs-ticket-root;4835">#4835</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to man-pages-5.11. Fixes
+          <ulink url="&lfs-ticket-root;4836">#4836</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to expat-2.3.0. Fixes
+          <ulink url="&lfs-ticket-root;4837">#4837</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to acl-2.3.1. Fixes
+          <ulink url="&lfs-ticket-root;4832">#4832</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2021-03-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Use <option>-j1</option> for Binutils
+		    installation.  Thanks report from Hans Meier.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2021-03-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.2604. Addreses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20210304. Addreses
+          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zstd-1.4.9. Fixes
+          <ulink url="&lfs-ticket-root;4827">#4827</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - Update to sysvinit-2.99. Fixes
+          <ulink url="&lfs-ticket-root;4822">#4822</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.11.6. Fixes
+          <ulink url="&lfs-ticket-root;4824">#4824</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.49. Fixes
+          <ulink url="&lfs-ticket-root;4831">#4831</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-5.11.0. Fixes
+          <ulink url="&lfs-ticket-root;4823">#4823</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.46.2. Fixes
+          <ulink url="&lfs-ticket-root;4826">#4826</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bison-3.7.6. Fixes
+          <ulink url="&lfs-ticket-root;4828">#4828</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-3.3.3. Fixes
+          <ulink url="&lfs-ticket-root;4825">#4825</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to attr-2.5.0. Fixes
+          <ulink url="&lfs-ticket-root;4830">#4830</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to acl-2.3.0. Fixes
+          <ulink url="&lfs-ticket-root;4829">#4829</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision="systemd">
+      <para>2021-03-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Simplify the installation of systemd man pages.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision="systemd">
+      <para>2021-03-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Patch systemd-247 so that it will function with
+          Linux-5.11 API headers.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2021-03-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix a header file for python, so that
+          <command>#include &lt;python&python-minor;/Python.h&gt;</command>
+          works.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter01/whatsnew.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -31,10 +31,10 @@
     <para>None</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Acl-&acl-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Attr-&attr-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
@@ -46,13 +46,13 @@
       <para>Bash &bash-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bc &bc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Binutils-&binutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Bison-&bison-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bzip2-&bzip2-version;</para>
@@ -73,13 +73,13 @@
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
        <para>Expat-&expat-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
        <para>Expect-&expect-version;</para>
@@ -121,13 +121,13 @@
       <para>Groff-&groff-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GRUB-&grub-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Gzip-&gzip-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IANA-Etc-&iana-etc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Inetutils-&inetutils-version;</para>
@@ -136,7 +136,7 @@
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IPRoute2-&iproute2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Kbd-&kbd-version;</para>
@@ -151,7 +151,7 @@
       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Libcap-&libcap-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
@@ -166,7 +166,7 @@
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>M4-&m4-version;</para>
@@ -178,7 +178,7 @@
       <para>Man-DB-&man-db-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Man-pages-&man-pages-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Meson-&meson-version;</para>
@@ -196,7 +196,7 @@
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Openssl-&openssl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Patch-&patch-version;</para>
@@ -226,13 +226,13 @@
       <para>Shadow-&shadow-version;</para>
     </listitem>-->
-    <!--<listitem revision="sysv">
+    <listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
     </listitem>-->
-    <!--<listitem revision="sysv">
+    <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Tar-&tar-version;</para>
@@ -250,7 +250,7 @@
       <para>Util-Linux-&util-linux-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Vim-&vim-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
@@ -262,7 +262,7 @@
       <para>Zlib-&zlib-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Zstd-&zstd-version;</para>
-    </listitem>-->
+    </listitem>
   </itemizedlist>
 
@@ -282,7 +282,10 @@
       <para>meson-0.56.0-upstream_fix-1.patch</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
+      <para>systemd-247-upstream_fixes-2.patch</para>
+    </listitem>
+    <listitem>
       <para>systemd-247-upstream_fixes-1.patch</para>
-    </listitem>-->
+    </listitem>
 
   </itemizedlist>
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter03/packages.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -191,13 +191,4 @@
         <para>Download: <ulink url="&file-url;"/></para>
         <para>MD5 sum: <literal>&file-md5;</literal></para>
-
-        <note>
-          <para>File (&file-version;) may no longer be available at the
-          listed location. The site administrators of the master download
-          location occasionally remove older versions when new ones are
-          released. An alternative download location that may have the correct
-          version available can also be found at: <ulink
-          url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para>
-        </note>
       </listitem>
     </varlistentry>
Index: chapter04/creatingminlayout.xml
===================================================================
--- chapter04/creatingminlayout.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter04/creatingminlayout.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -13,5 +13,6 @@
   <para>The first task performed in the LFS partition is to create a limited
   directory hierarchy so that programs compiled in <xref
-  linkend="chapter-temporary-tools"/> may be installed in their final
+  linkend="chapter-temporary-tools"/> (as well as glibc and libstdc++ in <xref
+  linkend="chapter-cross-tools"/>) may be installed in their final
   location. This is needed so that those temporary programs be overwritten
   when rebuilding them in <xref linkend="chapter-building-system"/>.</para>
Index: chapter05/binutils-pass1.xml
===================================================================
--- chapter05/binutils-pass1.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter05/binutils-pass1.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -145,5 +145,18 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install -j1</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the make parameter:</title>
+
+      <varlistentry>
+        <term><parameter>-j1</parameter></term>
+        <listitem>
+          <para>An issue in the building system may cause the installation
+          to fail with <option>-j N</option> in <envar>MAKEFLAGS</envar>.
+          Override it to workaround this issue.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
   </sect2>
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter05/glibc.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -44,5 +44,5 @@
     <title>Installation of Glibc</title>
 
-    <para arch="default">First, create a symbolic link for LSB compliance. Additionally,
+    <para>First, create a symbolic link for LSB compliance. Additionally,
     for x86_64, create a compatibility symbolic link required for proper
     operation of the dynamic library loader:</para>
@@ -55,12 +55,16 @@
     ;;
 esac</userinput></screen>
-
-    <para arch="ml_32,ml_x32,ml_all">First, create symbolic links for LSB compliance
-    and compatibility symbolic links required for proper
-    operation of the dynamic library loader:</para>
-
 <!-- no ld-linux.so.2 here as multilib is based on x86_64, not on i686 -->
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
 ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3</userinput></screen>
+
+    <note>
+      <para>
+        The above command is correct.  The <command>ln</command> command has
+        a few syntactic versions, so be sure to check
+		<command>info coreutils ln</command> and <filename>ln(1)</filename>
+		before reporting what you may think is an error.
+	  </para>
+    </note>
 
     <para>Some of the Glibc programs use the non-FHS compliant
Index: chapter05/libstdc++.xml
===================================================================
--- chapter05/libstdc++.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter05/libstdc++.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -76,6 +76,7 @@
         <term><parameter>--host=...</parameter></term>
         <listitem>
-          <para>Specifies the use the cross compiler we have just built
-          instead of the one in <filename>/usr/bin</filename>.</para>
+          <para>Specifies that the cross compiler we have just built
+          should be used instead of the one in
+          <filename>/usr/bin</filename>.</para>
         </listitem>
       </varlistentry>
Index: chapter06/binutils-pass2.xml
===================================================================
--- chapter06/binutils-pass2.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter06/binutils-pass2.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -107,14 +107,6 @@
     to link against zlib from the host distribution:</para>
 
-<screen><userinput remap="install">make DESTDIR=$LFS install
+<screen><userinput remap="install">make DESTDIR=$LFS install -j1
 install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
-
-    <para>
-      Workaround an issue causing
-      <filename class="libraryfile">libctf.so</filename>
-      to link against zlib from the host distribution:
-    </para>
-
-<screen><userinput remap="install">install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
 
   </sect2>
Index: chapter06/file.xml
===================================================================
--- chapter06/file.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter06/file.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -91,4 +91,10 @@
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
+    <para>Move a shared library into its final location in the LFS system,
+    and recreate the symlink for it:</para>
+
+<screen><userinput remap="install">mv -v $LFS/usr/lib/libmagic.so.* $LFS/lib
+ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) $LFS/usr/lib/libmagic.so</userinput></screen>
+
   </sect2>
 
Index: chapter08/autoconf.xml
===================================================================
--- chapter08/autoconf.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/autoconf.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -66,5 +66,5 @@
     Autoconf can be re-tested after Automake has been installed.  In addition,
     two tests fail due to changes in libtool-2.4.3 and later.</para>
-
+-->
     <note><para>The test time for autoconf can be reduced significantly on a
     system with multiple cores.  To do this, append
@@ -72,5 +72,5 @@
     instance, using -j4 can reduce the test time by over 60
     percent.</para></note>
--->
+
     <para>Install the package:</para>
 
Index: chapter08/bc.xml
===================================================================
--- chapter08/bc.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/bc.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -44,5 +44,5 @@
     <para>Prepare Bc for compilation:</para>
 
-<screen><userinput remap="configure">PREFIX=/usr CC=gcc ./configure.sh -G -O3</userinput></screen>
+<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3</userinput></screen>
 
     <variablelist>
@@ -50,7 +50,7 @@
 
       <varlistentry>
-        <term><parameter>CC=gcc"</parameter></term>
+        <term><parameter>CC=gcc</parameter></term>
         <listitem>
-          <para>These parameters specify the compiler to use.</para>
+          <para>This parameter specifies the compiler to use.</para>
         </listitem>
       </varlistentry>
Index: chapter08/binutils.xml
===================================================================
--- chapter08/binutils.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/binutils.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -154,5 +154,5 @@
           class="directory">$(exec_prefix)/$(target_alias)</filename>. For
           example, x86_64 machines would expand that to <filename
-          class="directory">/usr/x86_64-unknown-linux-gnu</filename>. Because this is
+          class="directory">/usr/x86_64-pc-linux-gnu</filename>. Because this is
           a custom system, this target-specific directory in <filename
           class="directory">/usr</filename> is not required. <filename
@@ -180,5 +180,5 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
+<screen><userinput remap="install">make tooldir=/usr install -j1</userinput></screen>
 
     <para>Remove useless static libraries:</para>
Index: chapter08/coreutils.xml
===================================================================
--- chapter08/coreutils.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/coreutils.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -195,5 +195,5 @@
         <listitem>
           <para>Is an actual command, /usr/bin/[, that is a synonym
-          for the <command>test</command> command.</para>
+          for the <command>test</command> command</para>
           <indexterm zone="ch-system-coreutils lbracket">
             <primary sortas="b-111">[</primary>
Index: chapter08/file.xml
===================================================================
--- chapter08/file.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/file.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -57,4 +57,14 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para><command>/bin/more</command> from util-linux will link to
+    <filename class="libraryfile">libmagic.so</filename>, so the shared
+    library should be moved to <filename class="directory">/lib</filename>,
+    and as a result the
+    <filename class="extension">.so</filename> file in
+    <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
+
+<screen><userinput remap="install">mv -v /usr/lib/libmagic.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) /usr/lib/libmagic.so</userinput></screen>
 
   </sect2>
Index: chapter08/gmp.xml
===================================================================
--- chapter08/gmp.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/gmp.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -107,5 +107,5 @@
     applications using the gmp libraries with the message "Illegal
     instruction".  In this case, gmp should be reconfigured with the option
-    --build=x86_64-unknown-linux-gnu and rebuilt.</para></caution>
+    --build=x86_64-pc-linux-gnu and rebuilt.</para></caution>
 
     <para>Ensure that all 197 tests in the test suite passed.
Index: chapter08/grub.xml
===================================================================
--- chapter08/grub.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/grub.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -41,9 +41,4 @@
     <title>Installation of GRUB</title>
 
-    <para>First, fix an issue introduced by binutils-2.36:</para>
-
-<screen><userinput remap="pre">sed "s/gold-version/&amp; -R .note.gnu.property/" \
-    -i Makefile.in grub-core/Makefile.in</userinput></screen>
-
     <para>Prepare GRUB for compilation:</para>
 
@@ -79,5 +74,7 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>The test suite for this packages is not recommended.  Most of
+    the tests depend on packages that are not available in the limited
+    LFS environment. To run the tests anyway, run <command>make check</command>.</para>
 
     <para>Install the package:</para>
Index: chapter08/meson.xml
===================================================================
--- chapter08/meson.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/meson.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -64,5 +64,7 @@
 
 <screen><userinput remap="install">python3 setup.py install --root=dest
-cp -rv dest/* /</userinput></screen>
+cp -rv dest/* /
+install -vDm644 data/shell-completions/bash/meson /usr/share/bash-completion/completions/meson
+install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson</userinput></screen>
 
     <variablelist>
Index: chapter08/python.xml
===================================================================
--- chapter08/python.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/python.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -42,4 +42,8 @@
   <sect2 role="installation">
     <title>Installation of Python 3</title>
+
+    <para>First, a header file needs to be fixed:</para>
+
+<screen><userinput remap="pre">sed 's|cpython/||' -i Include/cpython/pystate.h</userinput></screen>
 
     <para>Prepare Python for compilation:</para>
Index: chapter08/systemd.xml
===================================================================
--- chapter08/systemd.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter08/systemd.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -47,15 +47,9 @@
 -->
 
-    <para>First, apply a patch to fix some regressions:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>Create a symlink to work around the xsltproc command not being installed:</para>
-
-<screen><userinput remap="pre">ln -sf /bin/true /usr/bin/xsltproc</userinput></screen>
-
-    <para>Set up the man pages:</para>
-
-<screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
+    <!-- For linux-5.11's API headers changing the rfkill_event structure -->
+    <para>First, apply a patch to fix some regressions and fix functionality
+    with future versions of the kernel:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
 
     <para>Remove tests that cannot be built in chroot:</para>
@@ -96,5 +90,5 @@
       -Dhomed=false                 \
       -Duserdb=false                \
-      -Dman=true                    \
+      -Dman=false                   \
       -Dmode=release                \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
@@ -192,4 +186,13 @@
 
       <varlistentry>
+        <term><parameter>-Dman=false</parameter></term>
+        <listitem>
+          <para>Prevent the generation of man pages to avoid extra
+          dependencies.  We will install pre-generated man pages for systemd
+          from a tarball later.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>-Dmode=release</parameter></term>
         <listitem>
@@ -209,7 +212,7 @@
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>Remove an unnecessary symbolic link:</para>
-
-<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+    <para>Install the man pages:</para>
+
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
 
     <para>Remove a useless directory:</para>
Index: chapter09/networkd.xml
===================================================================
--- chapter09/networkd.xml	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ chapter09/networkd.xml	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -168,10 +168,11 @@
       <title>systemd-resolved Configuration</title>
 
-      <note><para>If using another means to configure your network
-      interfaces (ex: ppp, network-manager, etc.), or if using any type of
-      local resolver (ex: bind, dnsmasq, unbound, etc.), or any other software 
-      that generates an <filename>/etc/resolv.conf</filename> (ex: resolvconf),
-      the <command>systemd-resolved</command> service should not be
-      used.</para></note>
+      <note><para>If using methods incompatible with systemd-resolved to
+      configure your network interfaces (ex: ppp, etc.), or if using any
+      type of local resolver (ex: bind, dnsmasq, unbound, etc.),
+      or any other software that generates an <filename>/etc/resolv.conf</filename>
+      (ex: a <command>resolvconf</command> program other than the one
+      provided by systemd), the <command>systemd-resolved</command> service
+      should not be used.</para></note>
 
       <para>When using <command>systemd-resolved</command> for DNS
Index: general.ent
===================================================================
--- general.ent	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ general.ent	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -1,12 +1,12 @@
-<!ENTITY version         "SVN-20210301">
+<!ENTITY version         "SVN-20210326">
 <!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        "20210301-systemd">
+<!ENTITY versiond        "20210326-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "March 1st, 2021">
+<!ENTITY releasedate     "March 26th, 2021">
 
 <!ENTITY copyrightdate   "1999-2021"><!-- jhalfs needs a literal dash, not &ndash; -->
@@ -43,4 +43,5 @@
 <!ENTITY gnu             "https://ftp.gnu.org/gnu/">
 <!ENTITY gnu-software    "https://www.gnu.org/software/">
+<!ENTITY alpha-gnu       "https://alpha.gnu.org/gnu/">
 <!ENTITY kernel          "https://www.kernel.org/pub/">
 <!ENTITY sourceforge     "https://prdownloads.sourceforge.net/">
Index: packages.ent
===================================================================
--- packages.ent	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ packages.ent	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -14,16 +14,16 @@
 -->
 
-<!ENTITY acl-version "2.2.53">
-<!ENTITY acl-size "513 KB">
-<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz">
-<!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070">
+<!ENTITY acl-version "2.3.1">
+<!ENTITY acl-size "348 KB">
+<!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.xz">
+<!ENTITY acl-md5 "95ce715fe09acca7c12d3306d0f076b2">
 <!ENTITY acl-home "&savannah-nongnu;/projects/acl">
 <!ENTITY acl-fin-du "2.8 MB">
 <!ENTITY acl-fin-sbu "0.1 SBU">
 
-<!ENTITY attr-version "2.4.48">
-<!ENTITY attr-size "457 KB">
+<!ENTITY attr-version "2.5.1">
+<!ENTITY attr-size "456 KB">
 <!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz">
-<!ENTITY attr-md5 "bc1e5cb5c96d99b24886f1f527d3bb3d">
+<!ENTITY attr-md5 "ac1c5a7a084f0f83b8cace34211f64d8">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
 <!ENTITY attr-fin-du "4.2 MB">
@@ -58,8 +58,8 @@
 <!ENTITY bash-fin-sbu "1.6 SBU">
 
-<!ENTITY bc-version "3.3.0">
-<!ENTITY bc-size "225 KB">
+<!ENTITY bc-version "3.3.4">
+<!ENTITY bc-size "228 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "452ae2d467b1d7212bb7896c0c689825">
+<!ENTITY bc-md5 "1b6dd492cc1f04e3df4d83493f362768">
 <!ENTITY bc-home "https://git.yzena.com/gavin/bc">
 <!ENTITY bc-fin-du "6.7 MB">
@@ -78,8 +78,8 @@
 <!ENTITY binutils-fin-sbu "6.2 SBU">
 
-<!ENTITY bison-version "3.7.5">
-<!ENTITY bison-size "2,561 KB">
+<!ENTITY bison-version "3.7.6">
+<!ENTITY bison-size "2,566 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "9b762dc24a6723f86d14d957d3deeb90">
+<!ENTITY bison-md5 "d61aa92e3562cb7292b004ce96173cf7">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!ENTITY bison-tmp-du "52 MB">
@@ -140,8 +140,8 @@
 <!ENTITY diffutils-fin-sbu "0.4 SBU">
 
-<!ENTITY e2fsprogs-version "1.46.1">
-<!ENTITY e2fsprogs-size "9,269 KB">
+<!ENTITY e2fsprogs-version "1.46.2">
+<!ENTITY e2fsprogs-size "9,2675 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "8c52585522b7ca6bdae2bdecba27b3a4">
+<!ENTITY e2fsprogs-md5 "e8ef5fa3b72557be5e9fe564a25da6eb">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-fin-du "102 MB">
@@ -163,8 +163,8 @@
 <!ENTITY eudev-fin-sbu "0.2 SBU">
 
-<!ENTITY expat-version "2.2.10">
-<!ENTITY expat-size "416 KB">
+<!ENTITY expat-version "2.3.0">
+<!ENTITY expat-size "424 KB">
 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
-<!ENTITY expat-md5 "e0fe49a6b3480827c9455e4cfc799133">
+<!ENTITY expat-md5 "1c1b523a8d917e6d9f7af4f8881d8ec5">
 <!ENTITY expat-home "https://libexpat.github.io/">
 <!ENTITY expat-fin-du "14 MB">
@@ -182,5 +182,5 @@
 <!ENTITY file-version "5.39">
 <!ENTITY file-size "932 KB">
-<!ENTITY file-url "http://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
+<!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
 <!ENTITY file-md5 "1c450306053622803a25647d88f80f25">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
@@ -302,8 +302,9 @@
 <!ENTITY groff-fin-sbu "0.5 SBU">
 
-<!ENTITY grub-version "2.04">
-<!ENTITY grub-size "6,245 KB">
-<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
-<!ENTITY grub-md5 "5aaca6713b47ca2456d8324a58755ac7">
+<!ENTITY grub-version "2.06~rc1">
+<!ENTITY grub-size "6,391 KB">
+<!--<!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">-->
+<!ENTITY grub-url "https://alpha.gnu.org/gnu/grub/grub-&grub-version;.tar.xz">
+<!ENTITY grub-md5 "3c222b51347c182d655f9b94d5b56582">
 <!ENTITY grub-home "&gnu-software;grub/">
 <!ENTITY grub-fin-du "154 MB">
@@ -320,8 +321,8 @@
 <!ENTITY gzip-fin-sbu "0.1 SBU">
 
-<!ENTITY iana-etc-version "20210202">
+<!ENTITY iana-etc-version "20210304">
 <!ENTITY iana-etc-size "578 KB">
 <!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
-<!ENTITY iana-etc-md5 "1c193a4d6ca36274570d1505140a7bee">
+<!ENTITY iana-etc-md5 "db2d94cf0d1115c0107ae2aed966dbee">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.7 MB">
@@ -344,8 +345,8 @@
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "5.10.0">
-<!ENTITY iproute2-size "781 KB">
+<!ENTITY iproute2-version "5.11.0">
+<!ENTITY iproute2-size "803 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "19ffea480a21e600453776b7225f3319">
+<!ENTITY iproute2-md5 "a3c6b09590c0bd120f0ab0b6e36187a8">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "15 MB">
@@ -392,8 +393,8 @@
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.48">
-<!ENTITY libcap-size "130 KB">
+<!ENTITY libcap-version "2.49">
+<!ENTITY libcap-size "137 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "ca71693a9abe4e0ad9cc33a755ee47e0">
+<!ENTITY libcap-md5 "b43ae3690fe4d2cb32e4d25c0983ecd3">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "45 MB">
@@ -425,11 +426,11 @@
 
 <!ENTITY linux-major-version "5">
-<!ENTITY linux-minor-version "10">
-<!ENTITY linux-patch-version "17">
+<!ENTITY linux-minor-version "11">
+<!ENTITY linux-patch-version "10">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "113,548 KB">
+<!ENTITY linux-size "114,888 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "4908707ed841923d8d1814130d5c380f">
+<!ENTITY linux-md5 "a74b23a7d91e3d155062c71573d5381b">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
@@ -473,8 +474,8 @@
 <!ENTITY man-db-fin-sbu "0.4 SBU">
 
-<!ENTITY man-pages-version "5.10">
-<!ENTITY man-pages-size "1,707 KB">
+<!ENTITY man-pages-version "5.11">
+<!ENTITY man-pages-size "1,720 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "4ae3f74a1beddd919936e1058642644c">
+<!ENTITY man-pages-md5 "9f40e8fff6766563837d98d7d7c6e19b">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-fin-du "4.7 MB">
@@ -523,8 +524,8 @@
 <!ENTITY ninja-fin-sbu "0.2 SBU">
 
-<!ENTITY openssl-version "1.1.1j">
-<!ENTITY openssl-size "9,593 KB">
+<!ENTITY openssl-version "1.1.1k">
+<!ENTITY openssl-size "9,596 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "cccaa064ed860a2b4d1303811bf5c682">
+<!ENTITY openssl-md5 "c4e7d95f782b08116afa27b30393dd27">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "154 MB">
@@ -639,15 +640,16 @@
 <!ENTITY systemd-md5      "b0d6e603b814908acc69db29bbfb023c">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
+<!ENTITY systemd-man-version "247-2">
 <!ENTITY systemd-man-size "612 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5  "438c98be200e1c3b308e58a3399d4465">
+<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-man-version;.tar.xz">
+<!ENTITY systemd-man-md5  "7d8a53105b7a205f2863e360d9a23f95">
 <!ENTITY systemd-fin-du   "264 MB">
 <!ENTITY systemd-fin-sbu  "1.8 SBU">
 
-<!ENTITY sysvinit-version "2.98">
-<!ENTITY sysvinit-size "125 KB">
+<!ENTITY sysvinit-version "2.99">
+<!ENTITY sysvinit-size "124 KB">
 <!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
-<!ENTITY sysvinit-md5 "e3254f7622ea5cf2322b1b386a98ba59">
+<!ENTITY sysvinit-md5 "6abc0ea61b8dd4a41b4e931a43b1bb90">
 <!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
 <!ENTITY sysvinit-fin-du "1.4 MB">
@@ -703,5 +705,5 @@
 <!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://freshmeat.sourceforge.net/projects/util-linux">
+<!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "134 MB">
 <!ENTITY util-linux-tmp-sbu "0.7 SBU">
@@ -709,11 +711,11 @@
 <!ENTITY util-linux-fin-sbu "1.1 SBU">
 
-<!ENTITY vim-version "8.2.2433">
+<!ENTITY vim-version "8.2.2604">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "15,051 KB">
+<!ENTITY vim-size "15,084 KB">
 <!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
 <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
-<!ENTITY vim-md5 "a26555c8919cf40938d2428d834bf913">
+<!ENTITY vim-md5 "b9b50ddd0327cef5f1985b0222b8473f">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "208 MB">
@@ -746,8 +748,8 @@
 <!ENTITY zlib-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY zstd-version "1.4.8">
-<!ENTITY zstd-size "1,762 KB">
+<!ENTITY zstd-version "1.4.9">
+<!ENTITY zstd-size "1,779 KB">
 <!ENTITY zstd-url "https://github.com/facebook/zstd/releases/download/v&zstd-version;/zstd-&zstd-version;.tar.gz">
-<!ENTITY zstd-md5 "e873db7cfa5ef05832e6d55a5a572840">
+<!ENTITY zstd-md5 "eb718b8aae0302cabe20f968e500534d">
 <!ENTITY zstd-home "https://facebook.github.io/zstd/">
 <!ENTITY zstd-fin-du "59 MB">
Index: patches.ent
===================================================================
--- patches.ent	(revision eef83eaa056eeb9983e40d5ede347c6b803a7271)
+++ patches.ent	(revision ceebda5df5a59d41440720e7b6caa12945f5b0d8)
@@ -68,5 +68,5 @@
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
-<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
-<!ENTITY systemd-upstream-fixes-patch-md5 "573a166f3620875208f78bf4dc431c8b">
-<!ENTITY systemd-upstream-fixes-patch-size "8 KB">
+<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-2.patch">
+<!ENTITY systemd-upstream-fixes-patch-md5 "7afe3d13464ae7d20dbe5e6f0fb8ccd3">
+<!ENTITY systemd-upstream-fixes-patch-size "12 KB">
