diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d49840dad..238b5bee7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,540 +41,10 @@
     -->
 
     <listitem>
-      <para>2022-08-20</para>
+      <para>2022-09-01</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Update to vim-9.0.0228. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20220812. Addresses
-          <ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gcc-12.2.0. Fixes
-          <ulink url="&lfs-ticket-root;5098">#5098</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.19.2. Fixes
-          <ulink url="&lfs-ticket-root;5097">#5097</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2022c. Fixes
-          <ulink url="&lfs-ticket-root;5096">#5096</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to shadow-4.12.2. Fixes
-          <ulink url="&lfs-ticket-root;5095">#5095</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.63.1. Fixes
-          <ulink url="&lfs-ticket-root;5094">#5094</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to xz-5.2.6. Fixes
-          <ulink url="&lfs-ticket-root;5093">#5093</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-08-18</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Remove libtool archive (.la) files in Chapter 5
-          and 6 because those files are harmful for cross compilation.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-08-11</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to vim-9.0.0192. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20220803. Addresses
-          <ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to tzdata-2022b. Fixes
-          <ulink url="&lfs-ticket-root;5092">#5092</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iproute2-5.19.0. Fixes
-          <ulink url="&lfs-ticket-root;5086">#5086</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.19.1. Fixes
-          <ulink url="&lfs-ticket-root;5085">#5085</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-6.0.1. Fixes
-          <ulink url="&lfs-ticket-root;5090">#5090</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-08-06</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to binutils-2.39. Fixes
-          <ulink url="&lfs-ticket-root;5089">#5089</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-linux-2.38.1. Fixes
-          <ulink url="&lfs-ticket-root;5088">#5088</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python3-3.10.6. Fixes
-          <ulink url="&lfs-ticket-root;5087">#5087</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to glibc-2.36. Fixes
-          <ulink url="&lfs-ticket-root;5083">#5084</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-07-24</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.18.14. (Security fixes
-          for machines affected by the RETBleed vulnerability). Fixes
-          <ulink url="&lfs-ticket-root;5082">#5082</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.65. Fixes
-          <ulink url="&lfs-ticket-root;5083">#5083</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-07-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.63.0. Fixes
-          <ulink url="&lfs-ticket-root;5079">#5079</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kmod-30. Fixes
-          <ulink url="&lfs-ticket-root;5077">#5077</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to inetutils-2.3. Fixes
-          <ulink url="&lfs-ticket-root;5081">#5081</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.18.11. Fixes
-          <ulink url="&lfs-ticket-root;5078">#5078</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to OpenSSL-3.0.5. Fixes
-          <ulink url="&lfs-ticket-root;5080">#5080</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-07-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to vim-9.0.0006. Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20220610. Addresses
-          <ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to OpenSSL-3.0.4. Fixes
-          <ulink url="&lfs-ticket-root;5076">#5076</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kbd-2.5.1. Fixes
-          <ulink url="&lfs-ticket-root;5075">#5075</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.18.8. Fixes
-          <ulink url="&lfs-ticket-root;5074">#5074</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-5.3.3. Fixes
-          <ulink url="&lfs-ticket-root;5073">#5073</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-06-29</para>
-      <itemizedlist>
-        <listitem>
-          <para>[pierre] - Generate shared C++ bindings for ncurses, instead
-          of generating and then removing the static ones.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-06-14</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to python3-3.10.5. Fixes
-          <ulink url="&lfs-ticket-root;5070">#5070</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.62.2. Fixes
-          <ulink url="&lfs-ticket-root;5068">#5068</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to kbd-2.5.0. Fixes
-          <ulink url="&lfs-ticket-root;5067">#5067</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to file-5.42. Fixes
-          <ulink url="&lfs-ticket-root;5072">#5072</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.18.3. Fixes
-          <ulink url="&lfs-ticket-root;5069">#5069</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-5.3.1. Fixes
-          <ulink url="&lfs-ticket-root;5071">#5071</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-05-29</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to iana-etc-20220524.
-          Addresses <ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iproute2-5.18.0.  Fixes
-          <ulink url="&lfs-ticket-root;5065">#5065</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.18.1.  Fixes
-          <ulink url="&lfs-ticket-root;5061">#5061</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to perl-5.36.0.  Fixes
-          <ulink url="&lfs-ticket-root;5066">#5066</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-05-29</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Update to vim-8.2.5014 (security fixes).
-          Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to ninja-1.11.0.  Fixes
-          <ulink url="&lfs-ticket-root;5062">#5062</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to systemd-251.  Fixes
-          <ulink url="&lfs-ticket-root;5064">#5064</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-05-16</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.17.7.  Fixes
-          <ulink url="&lfs-ticket-root;5059">#5059</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to psmisc-23.5.  Fixes
-          <ulink url="&lfs-ticket-root;5060">#5060</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-05-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to openssl-3.0.3.  Fixes
-          <ulink url="&lfs-ticket-root;5057">#5057</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-05-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Change nobody/nogroup uid/gid to 65534. </para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.62.1.  Fixes
-          <ulink url="&lfs-ticket-root;5052">#5052</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libpipeline-1.5.6.  Fixes
-          <ulink url="&lfs-ticket-root;5053">#5053</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to elfutils-0.187.  Fixes
-          <ulink url="&lfs-ticket-root;5054">#5054</ulink>.</para>
-        </listitem>
-        <listitem revision="systemd">
-          <para>[bdubbs] - Update to Jinja2-3.1.2.  Fixes
-          <ulink url="&lfs-ticket-root;5055">#5055</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to vim-8.2.4814.  Addresses
-          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem revision="sysv">
-          <para>[bdubbs] - Update to sysvinit-3.03.  Fixes
-          <ulink url="&lfs-ticket-root;5046">#5046</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.17.5.  Fixes
-          <ulink url="&lfs-ticket-root;5050">#5050</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gcc-11.3.0.  Fixes
-          <ulink url="&lfs-ticket-root;5051">#5051</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to coreutils-9.1.  Fixes
-          <ulink url="&lfs-ticket-root;5048">#5048</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to bc-5.2.4.  Fixes
-          <ulink url="&lfs-ticket-root;5049">#5049</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-04-15</para>
-      <itemizedlist>
-        <listitem>
-           <para>[bdubbs] - Add wheel-0.37.1 (Python module).</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-04-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Patch Xz for a security fix.  Fixes
-          <ulink url="&lfs-ticket-root;5047">#5047</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to libcap-2.64.  Fixes
-          <ulink url="&lfs-ticket-root;5044">#5044</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.17.3.  Fixes
-          <ulink url="&lfs-ticket-root;5043">#5043</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to gzip-1.12.  Fixes
-          <ulink url="&lfs-ticket-root;5042">#5042</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-31</para>
-      <itemizedlist>
-        <listitem revision="sysv">
-          <para>[bdubbs] - Update to sysvinit-3.02.  Fixes
-          <ulink url="&lfs-ticket-root;5041">#5041</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to zlib-1.2.12 (Security Update).  Fixes
-          <ulink url="&lfs-ticket-root;5040">#5040</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to expat-2.4.8.  Fixes
-          <ulink url="&lfs-ticket-root;5039">#5039</ulink>.</para>
-        </listitem>
-        <listitem revision="systemd">
-          <para>[bdubbs] - Update to Jinja2-3.1.1.  Fixes
-          <ulink url="&lfs-ticket-root;5038">#5038</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to Python-3.10.4.  Fixes
-          <ulink url="&lfs-ticket-root;5037">#5037</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to procps-ng-4.0.0.  Fixes
-          <ulink url="&lfs-ticket-root;5036">#5036</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to iproute2-5.17.0.  Fixes
-          <ulink url="&lfs-ticket-root;5035">#5035</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.62.0.  Fixes
-          <ulink url="&lfs-ticket-root;5034">#5034</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to linux-5.17.1 (Security Update).  Fixes
-          <ulink url="&lfs-ticket-root;5033">#5033</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to util-linux-2.38.  Fixes
-          <ulink url="&lfs-ticket-root;4997">#4997</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-25</para>
-      <itemizedlist>
-        <listitem>
-          <para>[pierre] - Update bootscripts to 20220324.  Fixes
-          <ulink url="&lfs-ticket-root;5027">#5027</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-20</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Update to Python-3.10.3.  Fixes
-          <ulink url="&lfs-ticket-root;5028">#5028</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to libtool-2.4.7.  Fixes
-          <ulink url="&lfs-ticket-root;5029">#5029</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to linux-5.16.16.  Fixes
-          <ulink url="&lfs-ticket-root;5030">#5030</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to tzdata-2022a.  Fixes
-          <ulink url="&lfs-ticket-root;5031">#5031</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to man-db-2.10.2.  Fixes
-          <ulink url="&lfs-ticket-root;5032">#5032</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-16</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Update to MarkupSafe-2.1.1. Fixes
-          <ulink url="&lfs-ticket-root;5025">#5025</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-15</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - Update to openssl-3.0.2. Fixes
-          <ulink url="&lfs-ticket-root;5024">#5024</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[bdubbs] - Update to meson-0.61.3. Fixes
-          <ulink url="&lfs-ticket-root;5023">#5023</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to expat-2.4.7. Fixes
-          <ulink url="&lfs-ticket-root;5019">#5019</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to bc-5.2.3. Fixes
-          <ulink url="&lfs-ticket-root;5020">#5020</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to linux-5.16.14 (security fix). Fixes
-          <ulink url="&lfs-ticket-root;5021">#5021</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to perl-5.34.1. Fixes
-          <ulink url="&lfs-ticket-root;5022">#5022</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to vim-8.2.4567 (security fix).
-          Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-05</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Stop changing the owner of
-          <filename class='directory'>$LFS/source</filename> to
-          <systemitem class='username'>lfs</systemitem>. Fixes
-          <ulink url="&lfs-ticket-root;5018">#5018</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Add zstd-1.5.2 upstream fixes patch.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-02</para>
-      <itemizedlist>
-        <listitem>
-          <para>[xry111] - Update to meson-0.61.2. Fixes
-          <ulink url="&lfs-ticket-root;5013">#5013</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to linux-5.16.12. Fixes
-          <ulink url="&lfs-ticket-root;5014">#5014</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to MarkupSafe-2.1.0. Fixes
-          <ulink url="&lfs-ticket-root;5015">#5015</ulink>.</para>
-        </listitem>
-        <listitem revision="systemd">
-          <para>[xry111] - Update to dbus-1.14.0. Fixes
-          <ulink url="&lfs-ticket-root;5017">#5017</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Update to vim-8.2.4489 (security fixes).
-          Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Build libstdc++ in GCC pass 2, and remove the
-          separate libstdc++ pass 2.</para>
-        </listitem>
-        <listitem>
-          <para>[xry111] - Remove unneeded
-          <parameter>--enable-64bit</parameter> for tcl.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>2022-03-01</para>
-      <itemizedlist>
-        <listitem>
-          <para>[bdubbs] - LFS-11.1 released.</para>
+          <para>[bdubbs] - LFS-11.2 released.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index ac496bbae..c532bdb15 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -136,6 +136,11 @@
       your first disk drive.  A partition size of 200 megabytes is quite
       adequate.</para></listitem>
 
+      <listitem><para>/boot/efi &ndash; The EFI System Partition, which is
+      needed for booting the system with UEFI.  Read
+      <ulink url="&blfs-book;postlfs/grub-setup.html">the BLFS page</ulink>
+      for details.</para></listitem>
+
       <listitem><para>/home &ndash; Highly recommended.  Share your home
       directory and user customization across multiple distributions or LFS
       builds.  The size is generally fairly large and depends on available disk
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 4bfff53ba..4532d84cd 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -199,9 +199,8 @@ cd       build</userinput></screen>
       functions (compiling and linking) of the new toolchain are working as
       expected. To perform a sanity check, run the following commands:</para>
 
-<screen><userinput>echo 'int main(){}' &gt; dummy.c
-$LFS_TGT-gcc dummy.c
-readelf -l a.out | grep '/ld-linux'</userinput></screen>
+<screen><userinput>echo 'int main(){}' | gcc -xc -
+readelf -l a.out | grep ld-linux</userinput></screen>
 
       <para>If everything is working correctly, there should be no errors,
       and the output of the last command will be of the form:</para>
@@ -216,9 +215,9 @@ readelf -l a.out | grep '/ld-linux'</userinput></screen>
       where the problem is and correct it. This issue must be resolved before
       continuing on.</para>
 
-      <para>Once all is well, clean up the test files:</para>
+      <para>Once all is well, clean up the test file:</para>
 
-<screen><userinput>rm -v dummy.c a.out</userinput></screen>
+<screen><userinput>rm -v a.out</userinput></screen>
 
     </caution>
 
diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml
index ea510b85f..f00cee315 100644
--- a/chapter05/linux-headers.xml
+++ b/chapter05/linux-headers.xml
@@ -60,8 +60,7 @@
     for your target machine if it's not a 32-bit or 64-bit x86:</para>
 
 <screen><userinput remap="make">make headers ARCH=<replaceable>x86</replaceable>
-find usr/include -name '.*' -delete
-rm usr/include/Makefile
+find usr/include -type f ! -name '*.h' -delete
 </userinput><userinput remap="install">cp -rv usr/include $LFS/usr</userinput></screen>
 
   </sect2>
diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml
index a44acba41..fcf768f40 100644
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@ -89,7 +89,6 @@ cd       build</userinput></screen>
     LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc      \
     --prefix=/usr                                  \
     --with-build-sysroot=$LFS                      \
-    --enable-initfini-array                        \
     --disable-nls                                  \
     --disable-multilib                             \
     --disable-decimal-float                        \
@@ -143,15 +142,6 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--enable-initfini-array</parameter></term>
-        <listitem>
-          <para>This option is automatically enabled when building a native
-          compiler with a native compiler on x86. But here, we build with
-          a cross compiler, so we need to explicitly set this option.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 1e342b12f..b220e1509 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -173,6 +173,12 @@ esac</userinput></screen>
         addresses.</para> <!-- PR 24816 -->
       </listitem>
 
+      <!-- https://sourceware.org/pipermail/libc-alpha/2022-August/141567.html -->
+      <listitem>
+        <para>The <emphasis>stdlib/tst-arc4random-thread</emphasis>
+        test is known to fail if the host kernel is relatively old.</para>
+      </listitem>
+
       <listitem>
         <para>Some tests, for example
         <emphasis>nss/tst-nss-files-hosts-multi</emphasis>,
@@ -180,16 +186,6 @@ esac</userinput></screen>
         timeout.</para>
       </listitem>
 
-      <!--
-        https://lists.linuxfromscratch.org/sympa/arc/lfs-support/2022-06/msg00022.html
-        https://sourceware.org/pipermail/libc-alpha/2022-June/139839.html
-      -->
-      <listitem>
-        <para>About 27 tests, for example <emphasis>elf/tst-pldd</emphasis>,
-        are known to fail if the kernel supports namespaces (see
-        <filename>namespaces(7)</filename> for details) but the host distro
-        has disabled them via sysctl.</para>
-      </listitem>
 <!--
       <listitem>
         <para>The <emphasis>rt/tst-cputimer{1,2,3}</emphasis> tests depend on
@@ -453,10 +449,9 @@ unset ZONEINFO</userinput></screen>
 
     <para>By default, the dynamic loader (<filename
     class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
+    <filename class="directory">/usr/lib</filename> for dynamic libraries
+    that are needed by programs as they are run. However, if there are
+    libraries in directories other than
     <filename class="directory">/usr/lib</filename>, these need to be added
     to the <filename>/etc/ld.so.conf</filename> file in order for the
     dynamic loader to find them. Two directories that are commonly known
diff --git a/chapter08/groff.xml b/chapter08/groff.xml
index 032130217..4929ff71e 100644
--- a/chapter08/groff.xml
+++ b/chapter08/groff.xml
@@ -53,9 +53,7 @@
 
 <screen><userinput remap="configure">PAGE=<replaceable>&lt;paper_size&gt;</replaceable> ./configure --prefix=/usr</userinput></screen>
 
-    <para>This package does not support parallel build. Compile the package:</para>
-
-<screen><userinput remap="make">make -j1</userinput></screen>
+<screen><userinput remap="make">make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index e9008c31a..78304a3ab 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -167,8 +167,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-glue-efi">
         <term><command>grub-glue-efi</command></term>
         <listitem>
-          <para>Processes ia32 and amd64 EFI images and glues them
-          according to Apple format.</para>
+          <para>Glue 32-bit and 64-bit binary into Apple universal one.</para>
           <indexterm zone="ch-system-grub grub-glue-efi">
             <primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
           </indexterm>
diff --git a/chapter08/python.xml b/chapter08/python.xml
index da1f75cdc..0f50bf6ef 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -102,12 +102,24 @@
     <systemitem class='username'>root</systemitem> user.  The main reason
     of this recommendation is for avoiding a conflict with the system
     package manager (<command>dpkg</command> for example), but LFS does not
-    have a system-wide package manager so this is not a problem.  If desired,
-    suppress this warning by running the following commands:</para>
+    have a system-wide package manager so this is not a problem.  And,
+    <command>pip3</command> will attempt to check for a new version of
+    itself whenever it's run.  As domain name resolving is not configured
+    yet in LFS chroot environment, it will fail to check for a new version
+    and produce a warning.  Once we boot the LFS system and set up network
+    connection, it will then produce a warning telling the user to update it
+    from a pre-built wheel on PyPI if any new version is available.  But LFS
+    consider <command>pip3</command> a part of Python 3 so it should not be
+    updated separately, and an update from a pre-built wheel will deviate
+    from our purpose to build a Linux system from source code.  So the
+    warning for a new <command>pip3</command> version should be ignored as
+    well. If desired, suppress these warnings by running the following
+    commands:</para>
 
  <screen><userinput remap="install">cat &gt; /etc/pip.conf &lt;&lt; EOF
 [global]
 root-user-action = ignore
+disable-pip-version-check = true
 EOF
 </userinput></screen>
 <!--
diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index 9a2b4858a..7bef4b34d 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -141,6 +141,38 @@ EOF</userinput></screen>
     <emphasis>set root</emphasis> line to point to the boot partition.
     </para></note>
 
+    <note>
+      <para>The GRUB designator for a partition may change if you added or
+      removed some disks (including removable disks like USB thumb devices).
+      The change may cause boot failure because
+      <filename>grub.cfg</filename> refers to some <quote>old</quote>
+      designators.  If you wish to avoid such a problem, you may use
+      the UUID of partition and filesystem instead of GRUB designator to
+      specify a partition.
+      Run <command>lsblk -o UUID,PARTUUID,PATH,MOUNTPOINT</command> to show
+      the UUID of your filesystems (in <literal>UUID</literal> column) and
+      partitions (in <literal>PARTUUID</literal> column).  Then replace
+      <literal>set root=(hdx,y)</literal> with
+      <literal>search --set=root --fs-uuid <replaceable>&lt;UUID of the filesystem where the kernel is installed&gt;</replaceable></literal>, and replace
+      <literal>root=/dev/sda2</literal> with
+      <literal>root=PARTUUID=<replaceable>&lt;UUID of the partition where LFS is built&gt;</replaceable></literal>.</para>
+      <para>Note that the UUID of a partition and the UUID of the filesystem
+      in this partition is completely different.  Some online resources may
+      instruct you to use
+      <literal>root=UUID=<replaceable>&lt;filesystem UUID&gt;</replaceable></literal>
+      instead of
+      <literal>root=PARTUUID=<replaceable>&lt;partition UUID&gt;</replaceable></literal>,
+      but doing so will require an initramfs which is beyond the scope of
+      LFS.</para>
+      <para>The name of the device node for a partition in
+      <filename class='directory'>/dev</filename> may also change (more
+      unlikely than GRUB designator change though).  You can also replace
+      paths to device nodes like <literal>/dev/sda1</literal> with
+      <literal>PARTUUID=<replaceable>&lt;partition UUID&gt;</replaceable></literal>,
+      in <filename>/etc/fstab</filename>, to avoid a potential boot failure
+      in case the device node name has changed.</para>
+    </note>
+
     <para>GRUB is an extremely powerful program and it provides a tremendous
     number of options for booting from a wide variety of devices, operating
     systems, and partition types.  There are also many options for customization
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index ce0d410b2..9c1f36e4b 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -149,6 +149,23 @@ File systems  ---&gt;
    [*] Inotify support for userspace [CONFIG_INOTIFY_USER]
        Pseudo filesystems  ---&gt;
         [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]</screen>
+
+      <para>Enable some additional features if you are building a 64-bit
+      system.  If you are using menuconfig, enable them in the order of
+      <parameter>CONFIG_PCI_MSI</parameter> first, then
+      <parameter>CONFIG_IRQ_REMAP</parameter>, at last
+      <parameter>CONFIG_X86_X2APIC</parameter> because an option only
+      shows up after its dependencies are selected.</para>
+
+      <screen role="nodump">Processor type and features ---&gt;
+  [*] Support x2apic [CONFIG_X86_X2APIC]
+Memory Management options  ---&gt;
+  [ ] Enable userfaultfd() system call [CONFIG_USERFAULTFD]
+Device Drivers ---&gt;
+  [*] PCI Support ---&gt; [CONFIG_PCI]
+    [*] Message Signaled Interrupts (MSI and MSI-X) [CONFIG_PCI_MSI]
+  [*] IOMMU Hardware Support ---&gt; [CONFIG_IOMMU_SUPPORT]
+    [*] Support for Interrupt Remapping [CONFIG_IRQ_REMAP]</screen>
     </note>
 
     <note revision="systemd">
@@ -225,6 +242,28 @@ File systems  ---&gt;
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>Support x2apic</parameter></term>
+        <listitem>
+          <para>Support running the interrupt controller of 64-bit x86
+          processors in x2APIC mode.  x2APIC may be enabled by firmware on
+          64-bit x86 systems, and a kernel without this option enabled will
+          panic on boot if x2APIC is enabled by firmware.  This option has
+          has no effect, but also does no harm if x2APIC is disabled by the
+          firmware.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>Enable userfaultfd() system call</parameter></term>
+        <listitem>
+          <para>If this option is enabled, a security vulnerability not
+          resolved in Linux-&linux-version; yet will be exploitable.
+          Disable this option to avoid the vulnerability.  This system call
+          is not used by any part of LFS or BLFS.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Alternatively, <command>make oldconfig</command> may be more
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index bc77ed61a..f6bf79acc 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -61,6 +61,11 @@
     url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
     </para></listitem>
 
+    <listitem><para>Install <ulink
+    url='&blfs-book;postlfs/firmware.html'>firmwares</ulink> if the kernel
+    driver for your hardware require some firmware to function properly.
+    </para></listitem>
+
     <listitem><para>Finally, a review of the following configuration files
     is also appropriate at this point.</para>