Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 9c3ce2ac8b15a4e00d26be4ee4345534b43db2b5)
+++ chapter01/changelog.xml	(revision 7fe99c2ca7bd3c4ea21e4c17b3350dbec7f4a1b6)
@@ -44,4 +44,38 @@
     -->
     <listitem>
+      <para>2021-05-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20210611. Addresses
+          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.3001. Addresses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.37. Fixes
+          <ulink url="&lfs-ticket-root;4865">#4865</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.58.1. Fixes
+          <ulink url="&lfs-ticket-root;4867">#4867</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.12.10. Fixes
+          <ulink url="&lfs-ticket-root;4857">#4866</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to m4-1.4.19. Fixes
+          <ulink url="&lfs-ticket-root;4864">#4864</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grub-2.06. Fixes
+          <ulink url="&lfs-ticket-root;4868">#4868</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-06-09</para>
       <itemizedlist>
@@ -106,5 +140,5 @@
         </listitem>
         <listitem>
-          <para>[bdubbs] - Update to inux-5.12.7. Fixes
+          <para>[bdubbs] - Update to linux-5.12.7. Fixes
           <ulink url="&lfs-ticket-root;4857">#4857</ulink>.</para>
         </listitem>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 9c3ce2ac8b15a4e00d26be4ee4345534b43db2b5)
+++ chapter01/whatsnew.xml	(revision 7fe99c2ca7bd3c4ea21e4c17b3350dbec7f4a1b6)
@@ -169,7 +169,7 @@
       <para>Linux-&linux-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>M4-&m4-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Make-&make-version;</para>
@@ -247,7 +247,7 @@
       <para>Tzdata-&tzdata-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux-&util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Vim-&vim-version;</para>
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision 9c3ce2ac8b15a4e00d26be4ee4345534b43db2b5)
+++ chapter03/packages.xml	(revision 7fe99c2ca7bd3c4ea21e4c17b3350dbec7f4a1b6)
@@ -722,4 +722,18 @@
         <para>Download: <ulink url="&util-linux-url;"/></para>
         <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Util-linux Man Pages - <token>&util-linux-man-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&util-linux-man-url;"/></para>
+        <para>MD5 sum: <literal>&util-linux-man-md5;</literal></para>
+
+        <note>
+          <para>The Linux From Scratch team generates its own tarball of the
+          man pages using the util-linux source. This is done in order to avoid
+          unnecessary dependencies.</para>
+        </note>
       </listitem>
     </varlistentry>
Index: chapter08/chapter08.xml
===================================================================
--- chapter08/chapter08.xml	(revision 9c3ce2ac8b15a4e00d26be4ee4345534b43db2b5)
+++ chapter08/chapter08.xml	(revision 7fe99c2ca7bd3c4ea21e4c17b3350dbec7f4a1b6)
@@ -79,5 +79,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
@@ -92,4 +91,5 @@
 
   <!-- Both sysv on systemd builds -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
Index: chapter08/util-linux.xml
===================================================================
--- chapter08/util-linux.xml	(revision 9c3ce2ac8b15a4e00d26be4ee4345534b43db2b5)
+++ chapter08/util-linux.xml	(revision 7fe99c2ca7bd3c4ea21e4c17b3350dbec7f4a1b6)
@@ -102,4 +102,9 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+  <para>Finally, install the man pages:</para>
+
+<screen><userinput remap="install">tar -xf ../util-linux-man-pages-&util-linux-version;.tar.xz \
+--directory /usr/share/man --strip-components=1</userinput></screen>
 
   </sect2>
Index: packages.ent
===================================================================
--- packages.ent	(revision 9c3ce2ac8b15a4e00d26be4ee4345534b43db2b5)
+++ packages.ent	(revision 7fe99c2ca7bd3c4ea21e4c17b3350dbec7f4a1b6)
@@ -302,9 +302,9 @@
 <!ENTITY groff-fin-sbu "0.5 SBU">
 
-<!ENTITY grub-version "2.06~rc1">
-<!ENTITY grub-size "6,391 KB">
+<!ENTITY grub-version "2.06">
+<!ENTITY grub-size "6,428 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-md5 "cf0fd928b1e5479c8108ee52cb114363">
 <!ENTITY grub-home "&gnu-software;grub/">
 <!ENTITY grub-fin-du "154 MB">
@@ -321,8 +321,8 @@
 <!ENTITY gzip-fin-sbu "0.1 SBU">
 
-<!ENTITY iana-etc-version "20210526">
+<!ENTITY iana-etc-version "20210611">
 <!ENTITY iana-etc-size "579 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 "8442d67cc5f5b3616d128e25779a93c7">
+<!ENTITY iana-etc-md5 "f2854be57fe281e3ffc7364984467d2f">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.7 MB">
@@ -419,10 +419,10 @@
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "12">
-<!ENTITY linux-patch-version "8">
+<!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 "115,385 KB">
+<!ENTITY linux-size "115,379 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "77cb5ae53f13405dac2a5bcb887a274a">
+<!ENTITY linux-md5 "7a3d78b97103f2b64c8c8592c1dfbe8d">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
@@ -438,8 +438,8 @@
 <!ENTITY linux-headers-fin-sbu "0.1 SBU">-->
 
-<!ENTITY m4-version "1.4.18">
-<!ENTITY m4-size "1,180 KB">
+<!ENTITY m4-version "1.4.19">
+<!ENTITY m4-size "1,617 KB">
 <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.xz">
-<!ENTITY m4-md5 "730bb15d96fffe47e148d1e09235af82">
+<!ENTITY m4-md5 "0d90823e1426f1da2fd872df0311298d">
 <!ENTITY m4-home "&gnu-software;m4/">
 <!ENTITY m4-tmp-du "22 MB">
@@ -474,8 +474,8 @@
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.58.0">
-<!ENTITY meson-size "1,844 KB">
+<!ENTITY meson-version "0.58.1">
+<!ENTITY meson-size "1,852 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "18ac55e3d6a5acb17b5737eb2a15bb5b">
+<!ENTITY meson-md5 "7e10667e08159a61c4f524b148799ec8">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "37 MB">
@@ -692,10 +692,13 @@
 <!ENTITY udev-lfs-home    " ">
 
-<!ENTITY util-linux-minor "2.36">
-<!ENTITY util-linux-version "2.36.2"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "5,223 KB">
+<!ENTITY util-linux-minor "2.37">
+<!ENTITY util-linux-version "2.37"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "5,390 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-md5 "75eb0a648098332d4042f1646eca4069">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
+<!ENTITY util-linux-man-url "&anduin-sources;/util-linux-man-pages-&util-linux-version;.tar.xz">
+<!ENTITY util-linux-man-md5 "882fdfd411f2a8d9fdf6635458539ff4">
+<!ENTITY util-linux-man-size "149 KB">
 <!ENTITY util-linux-tmp-du "134 MB">
 <!ENTITY util-linux-tmp-sbu "0.7 SBU">
@@ -703,11 +706,11 @@
 <!ENTITY util-linux-fin-sbu "1.1 SBU">
 
-<!ENTITY vim-version "8.2.2890">
+<!ENTITY vim-version "8.2.3001">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "15,153 KB">
+<!ENTITY vim-size "15,177 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 "ec8a8ec5f67b0ad0edba82cad2354d33">
+<!ENTITY vim-md5 "895ea89021de539256f767d55fb82960">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "208 MB">
