diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 45190d8c9..4d4d9bc0c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,20 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2025-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to vim-9.1.1122 (Security Update).
+          Addresses <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to man-pages-6.11.  Fixes
+          <ulink url='&lfs-ticket-root;5646'>#5646</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2025-02-13</para>
       <itemizedlist>
diff --git a/chapter08/man-pages.xml b/chapter08/man-pages.xml
index 54029fd2d..6c196c202 100644
--- a/chapter08/man-pages.xml
+++ b/chapter08/man-pages.xml
@@ -48,7 +48,32 @@
 
     <para>Install Man-pages by running:</para>
 
-<screen><userinput remap="install">make prefix=/usr install</userinput></screen>
+<screen><userinput remap="install">make -R GIT=false prefix=/usr install</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the options:</title>
+
+      <!-- TODO: Try if we can remove this when we update make.  -->
+      <varlistentry>
+        <term><parameter>-R</parameter></term>
+        <listitem>
+          <para>This prevents <command>make</command> from setting any
+          built-in variables.  The building system of man-pages does not
+          work well with built-in variables, but currently there is no way
+          to disable them except passing <parameter>-R</parameter>
+          explicitly via the command line.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>GIT=false</parameter></term>
+        <listitem>
+          <para>This prevents the building system from emitting many
+          <computeroutput>git: command not found</computeroutput>
+          warnings lines.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
   </sect2>
 
diff --git a/packages.ent b/packages.ent
index 6966b1653..4504a8922 100644
--- a/packages.ent
+++ b/packages.ent
@@ -487,10 +487,10 @@
 <!ENTITY man-db-fin-du "44 MB">
 <!ENTITY man-db-fin-sbu "0.3 SBU">
 
-<!ENTITY man-pages-version "6.10">
-<!ENTITY man-pages-size "1,835 KB">
+<!ENTITY man-pages-version "6.11">
+<!ENTITY man-pages-size "1,837 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "31b3dd6309da64a249ff01f53616b17f">
+<!ENTITY man-pages-md5 "f38a68fcd6cd0faf8a17956b16e8aa60">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-fin-du "52 MB">
 <!ENTITY man-pages-fin-sbu "0.1 SBU">
@@ -744,10 +744,10 @@
 <!ENTITY util-linux-fin-du "316 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">
 
-<!ENTITY vim-version "9.1.1106">
+<!ENTITY vim-version "9.1.1122">
 <!-- <!ENTITY vim-majmin "90"> -->
 <!ENTITY vim-docdir "vim/vim91">
-<!ENTITY vim-size "18,053 KB">
+<!ENTITY vim-size "18,057 KB">
 <!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
 <!-- N.B. LFS 9.0 uses
      https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz
@@ -761,7 +761,7 @@
      example, https://github.com/vim/vim/tags?after=v8.1.1847 will show
      us v8.1.1846. -->
 <!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
-<!ENTITY vim-md5 "3ed2d26c95b08dff8b8b29786937b693">
+<!ENTITY vim-md5 "c6980db0c12e69dd5086b151b4958360">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "251 MB">
 <!ENTITY vim-fin-sbu "3.4 SBU">