diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index f7e586d08..b868d1d83 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -454,7 +454,6 @@
           patches can be downloaded separately.  This may save some time or
           cost for a subsequent patch level upgrade within a minor release.
           </para>
-
         </note>
       </listitem>
     </varlistentry>
@@ -752,6 +751,13 @@
         <para>Home page: <ulink url="&vim-home;"/></para>
         <para>Download: <ulink url="&vim-url;"/></para>
         <para>MD5 sum: <literal>&vim-md5;</literal></para>
+        <note>
+          <para>
+            The version of vim changes daily. The get the latest version, go to
+            <ulink url="https://github.com/vim/vim/releases">
+            https://github.com/vim/vim/releases</ulink>.
+          </para>
+        </note>
       </listitem>
     </varlistentry>
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 9797c863c..04427880f 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -182,6 +182,15 @@ cd       build</userinput></screen>
     <variablelist>
       <title>The meaning of the configure options:</title>
 
+      <varlistentry>
+        <term><parameter>--with-glibc-version=2.11</parameter></term>
+        <listitem>
+          <para>This option ensures the package will be compatible with the host's
+          version of glibc.  It is set to the minimum glibc requirement 
+          specified in the <xref linkend="ch-partitioning-hostreqs"/>.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--with-newlib</parameter></term>
         <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index a976665e6..d1e8086b2 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -61,11 +61,12 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-glob-patch;</userinput></screen>
 -->
+<!-- No longer needed
     <para>Fix a problem introduced with the linux-5.2 kernel:</para>
 
 <screen><userinput remap="pre">sed -i '/asm.socket.h/a# include &lt;linux/sockios.h&gt;' \
    sysdeps/unix/sysv/linux/bits/socket.h</userinput></screen>
-
+-->
     <para>Create a symlink for LSB
     compliance. Additionally, for x86_64, create a compatibility symlink
     required for the dynamic loader to function correctly:</para>
diff --git a/lfs-latest.php b/lfs-latest.php
index b1de12689..3d1c243e3 100644
--- a/lfs-latest.php
+++ b/lfs-latest.php
@@ -120,8 +120,10 @@ if ( $package == "meson"      ) $dirpath = "https://github.com/mesonbuild/meson/
 if ( $package == "mpc"        ) $dirpath = "https://ftp.gnu.org/gnu/mpc";
 if ( $package == "mpfr"       ) $dirpath = "http://mpfr.loria.fr/mpfr-current";
 if ( $package == "ninja"      ) $dirpath = "https://github.com/ninja-build/ninja/releases";
-if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
-if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
+//if ( $package == "procps-ng"  ) $dirpath = "http://sourceforge.net/projects/procps-ng/files";
+if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
+//if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
+if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
 if ( $package == "shadow"     ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
 if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
 if ( $package == "tcl"        ) $dirpath = "http://sourceforge.net/projects/tcl/files";
@@ -275,6 +277,12 @@ if ( $package == "zstd"       ) $dirpath = "https://github.com/facebook/zstd/rel
      return str_replace( "_", ".", $max );
   }
 
+  if ( $package == "procps-ng" )
+     return find_max( $lines, "/release/", "/^.* ([\d\.]+).*$/" );
+
+  if ( $package == "psmisc" )
+     return find_max( $lines, "/^v/", "/^v([\d\.]+).*$/" );
+
   if ( $package == "grub" )
      return find_max( $lines, "/grub/", "/^.*grub-(\d\..*).tar.xz.*$/" );
 
diff --git a/packages.ent b/packages.ent
index d149cb998..a4cb0ec0b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -718,7 +718,8 @@
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
 <!ENTITY vim-size "14,406 KB">
-<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
+<!--<!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 "f5337b1170df90e644a636539a0313a3">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-ch6-du "202 MB">