Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ general/genutils/imagemagick.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -130,5 +130,5 @@
       summary of this information, as well as some additional notes can be
       viewed on-line at <ulink
-      url="http://www.imagemagick.org/script/advanced-unix-installation.php"/>.
+      url="https://imagemagick.org/script/advanced-unix-installation.php"/>.
     </para>
 
@@ -154,6 +154,6 @@
       <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (for raw formats
       listed in
-      <ulink url="http://imagemagick.org/script/formats.php">
-      http://www.imagemagick.org/www/formats.html</ulink>)
+      <ulink url="https://imagemagick.org/script/formats.php">
+      https://imagemagick.org/script/formats.php</ulink>)
     </para>
 
@@ -212,5 +212,5 @@
       <ulink url="http://user.it.uu.se/~jan/html2ps.html">html2ps</ulink>,
       <ulink url="http://wvware.sourceforge.net/">libwmf</ulink>,
-      <ulink url="http://sk1project.org/modules.php?name=products&amp;product=uniconvertor">
+      <ulink url="https://sk1project.net/uc2/">
       UniConvertor</ulink>, and
       <ulink url="http://www.cs.utah.edu/gdc/projects/urt/">Utah Raster Toolkit</ulink>
Index: general/graphlib/lcms2.xml
===================================================================
--- general/graphlib/lcms2.xml	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ general/graphlib/lcms2.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -7,7 +7,7 @@
   <!ENTITY lcms2-download-http "&sourceforge-dl;/lcms/lcms2-&lcms2-version;.tar.gz">
   <!ENTITY lcms2-download-ftp  " ">
-  <!ENTITY lcms2-md5sum        "8de1b7724f578d2995c8fdfa35c3ad0e">
-  <!ENTITY lcms2-size          "10 MB">
-  <!ENTITY lcms2-buildsize     "24 MB (with the tests)">
+  <!ENTITY lcms2-md5sum        "c5f915d681325e0767e40187799f23b1">
+  <!ENTITY lcms2-size          "15 MB">
+  <!ENTITY lcms2-buildsize     "30 MB (with the tests)">
   <!ENTITY lcms2-time          "0.2 SBU (with the tests)">
 ]>
@@ -88,4 +88,5 @@
     <title>Installation of Little CMS2</title>
 
+<!-- Seems to be fixed in 2.10
     <para>
       If you want to run tests, then the build procedure must
@@ -96,4 +97,5 @@
 <screen><userinput>sed -i '/AX_APPEND/s/^/#/' configure.ac &amp;&amp;
 autoreconf</userinput></screen>
+-->
 
     <para>
Index: gnome.ent
===================================================================
--- gnome.ent	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ gnome.ent	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -25,5 +25,5 @@
 <!ENTITY GConf-version                     "3.2.6">
 <!ENTITY geocode-glib-version              "3.26.2">
-<!ENTITY gjs-version                       "1.64.2">
+<!ENTITY gjs-version                       "1.64.3">
 <!ENTITY gnome-autoar-version              "0.2.4">
 <!ENTITY gnome-desktop-version             "3.36.2">
@@ -76,5 +76,5 @@
 <!ENTITY cheese-version                    "3.34.0">
 <!ENTITY eog-version                       "3.36.2">
-<!ENTITY evince-version                    "3.36.1">
+<!ENTITY evince-version                    "3.36.3">
 <!ENTITY evolution-version                 "3.36.3">
 <!ENTITY file-roller-version               "3.36.2">
Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ gnome/applications/evince.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -9,8 +9,8 @@
   <!ENTITY evince-download-ftp
      "&gnome-download-ftp;/evince/&gnome-minor-36;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "0acb95730933fb4b591c73c3fc7fc688">
-  <!ENTITY evince-size          "2.5 MB">
-  <!ENTITY evince-buildsize     "74 MB">
-  <!ENTITY evince-time          "0.7 SBU (Using parallelism=4)">
+  <!ENTITY evince-md5sum        "9762dabdde37a804072bccbfd311d357">
+  <!ENTITY evince-size          "2.8 MB">
+  <!ENTITY evince-buildsize     "84 MB">
+  <!ENTITY evince-time          "0.4 SBU (Using parallelism=4)">
 ]>
 
@@ -129,21 +129,15 @@
     </para>
 
-<screen revision="sysv"><userinput>CFLAGS="$CFLAGS -I/opt/texlive/&texlive-year;/include    " \
-CXXFLAGS="$CXXFLAGS -I/opt/texlive/&texlive-year;/include" \
-./configure --prefix=/usr                         \
-            --enable-introspection                \
-            --without-gspell                      \
-            --disable-static                      \
-            --with-systemduserunitdir=no         &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>CFLAGS="$CFLAGS -I/opt/texlive/&texlive-year;/include"      \
-CXXFLAGS="$CXXFLAGS -I/opt/texlive/&texlive-year;/include"  \
-LDFLAGS="$LDFLAGS -L/opt/texlive/&texlive-year;/lib"        \
-./configure --prefix=/usr                         \
-            --enable-introspection                \
-            --without-gspell                      \
-            --disable-static                     &amp;&amp;
-make</userinput></screen>
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr -Dgtk_doc=false -Dsystemduserunitdir=no .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -155,5 +149,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -172,4 +166,7 @@
     -->
 
+<!-- When moving to Meson, I installed the whole texlive suite from source.
+     I was able to verify that this is no longer required. I'm assuming it was
+     one of evince-3.36.3 or texlive-2020 that fixed this.
     <para>
       <parameter>CFLAGS="$CFLAGS ..." CXXFLAGS="$CXXFLAGS ..." LDFLAGS="$LDFLAGS ..."</parameter>: If
@@ -182,17 +179,24 @@
       build.
     </para>
-
-    <para>
-      <parameter>--without-gspell</parameter>: This switch turns off support
-      for the spell checking plugin. Remove this if you have gspell installed.
-    </para>
-
-    <para>
-      <parameter>--enable-introspection</parameter>: By default, the
-      <application>Gobject Introspection</application> support is
-      turned off, even though that package is an expected component
-      of the <application>GNOME</application> Desktop.
-    </para>
-
+-->
+    <para>
+      <parameter>-Dgtk_doc=false</parameter>: This switch disables generating
+      the gtk-doc API reference documentation. If you have
+      <xref role="nodep" linkend="gtk-doc"/> installed and wish to generate
+      the API reference documentation, remove this switch.
+    </para>
+
+    <para>
+      <option>-Dgspell=false</option>: This switch turns off support
+      for the spell checking plugin.
+    </para>
+
+    <para>
+      <option>-Dintrospection=false</option>: Use this option if you
+      don't have <xref role="nodep" linkend="gobject-introspection"/> 
+      installed and don't wish to have introspection support built into Evince.
+    </para>
+
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -200,7 +204,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--disable-nautilus</option>: This switch disables building
+-->
+
+    <para>
+      <option>-Dnautilus=false</option>: This switch disables building
       the <application>Nautilus</application> Plugin. Use this switch
       if <application>Nautilus</application> is not installed.
@@ -208,5 +213,5 @@
 
     <para>
-      <option>--without-keyring</option>: This switch disables the use of
+      <option>-Dkeyring=false</option>: This switch disables the use of
       <application>libsecret</application>. Use this switch
       if <application>libsecret</application> is not installed.
Index: gnome/platform/gjs.xml
===================================================================
--- gnome/platform/gjs.xml	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ gnome/platform/gjs.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -7,7 +7,7 @@
   <!ENTITY gjs-download-http "&gnome-download-http;/gjs/1.64/gjs-&gjs-version;.tar.xz">
   <!ENTITY gjs-download-ftp  "&gnome-download-ftp;/gjs/1.64/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-md5sum        "bd2f7f411b46016e8ee2d2c8d3c140d9">
-  <!ENTITY gjs-size          "412 KB">
-  <!ENTITY gjs-buildsize     "314 MB (with tests)">
+  <!ENTITY gjs-md5sum        "e25ca40cd2c1b88e4778ddb6bb7f4d64">
+  <!ENTITY gjs-size          "416 KB">
+  <!ENTITY gjs-buildsize     "273 MB (with tests)">
   <!ENTITY gjs-time          "0.6 SBU (with tests)">
 ]>
@@ -111,7 +111,9 @@
          to adding symbolic link support for Windows NT-based platforms.
          This shouldn't affect us, so let's create the symlink manually
-         like we do in other packages.-->
-
-<screen><userinput remap="pre">sed -i '/symlink-gjs.py/s/^/#/g' meson.build</userinput></screen>
+         like we do in other packages.
+         Invalid with 1.64.3. Make sure you don't have DESTDIR
+         set, such as you'd do in an update script.-->
+
+<!--<screen><userinput remap="pre">sed -i '/symlink-gjs.py/s/^/#/g' meson.build</userinput></screen>-->
 
     <para>
@@ -131,5 +133,5 @@
       tests will fail if not running in an Xorg session. One test,
       <filename>gjs: Scripts/CommandLine</filename>, is known to fail.
-      On some systems, up to four tests may fail with an error.
+      On some systems, up to six tests may fail with an error.
       <!-- Still fails with 1.58.5. -->
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ introduction/welcome/changelog.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -46,4 +46,20 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to evince-3.36.3. Fixes
+          <ulink url="&blfs-ticket-root;13613">#13613</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to lcms2-2.10. Fixes
+          <ulink url="&blfs-ticket-root;13618">#13618</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to dhcpcd-9.1.0. Fixes
+          <ulink url="&blfs-ticket-root;13619">#13619</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gjs-1.64.3. Fixes
+          <ulink url="&blfs-ticket-root;13620">#13620</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to librsvg-2.48.6. Fixes
           <ulink url="&blfs-ticket-root;13625">#13625</ulink>.</para>
Index: networking/connect/dhcpcd.xml
===================================================================
--- networking/connect/dhcpcd.xml	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ networking/connect/dhcpcd.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -7,6 +7,6 @@
   <!ENTITY dhcpcd-download-http "https://roy.marples.name/downloads/dhcpcd/dhcpcd-&dhcpcd-version;.tar.xz">
   <!ENTITY dhcpcd-download-ftp  "ftp://roy.marples.name/pub/dhcpcd/dhcpcd-&dhcpcd-version;.tar.xz">
-  <!ENTITY dhcpcd-md5sum        "f62118a576b01f5d0adf0c5ce617fbe7">
-  <!ENTITY dhcpcd-size          "240 KB">
+  <!ENTITY dhcpcd-md5sum        "2134bdd3957eeffb1facce6b1e4ae83e">
+  <!ENTITY dhcpcd-size          "244 KB">
   <!ENTITY dhcpcd-buildsize     "3.4 MB (with tests)">
   <!ENTITY dhcpcd-time          "less than 0.1 SBU (with tests)">
Index: packages.ent
===================================================================
--- packages.ent	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ packages.ent	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -213,5 +213,5 @@
 <!ENTITY jasper-version               "2.0.14">
 <!ENTITY lcms-version                 "1.19">
-<!ENTITY lcms2-version                "2.9">
+<!ENTITY lcms2-version                "2.10">
 <!ENTITY libexif-version              "0.6.21">
 <!ENTITY libgxps-version              "0.3.1">
@@ -569,5 +569,5 @@
 <!-- Chapter 14 -->
 <!--<!ENTITY ppp-version                  "2.4.5">-->
-<!ENTITY dhcpcd-version               "9.0.2">
+<!ENTITY dhcpcd-version               "9.1.0">
 <!ENTITY dhcp-version                 "4.4.2">
 
Index: pst/typesetting/dvisvgm.xml
===================================================================
--- pst/typesetting/dvisvgm.xml	(revision 597d3c9b2d0c2aebc11492c483e7d9e716843377)
+++ pst/typesetting/dvisvgm.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -161,7 +161,7 @@
 
     <segmentedlist>
-      <segtitle>Installed Program(s)</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -170,8 +170,8 @@
         </seg>
         <seg>
-          none
+          None
         </seg>
         <seg>
-          none
+          None
         </seg>
       </seglistitem>
