Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision 8ddf6d5c80706bdf4b45a3c2964268b5f1b5688b)
+++ general/prog/mercurial.xml	(revision d44531659d0be76785e2349014c8f4ce6dda333d)
@@ -7,8 +7,8 @@
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "824b839a6e948844b81c757968f888bc">
-  <!ENTITY mercurial-size          "7.2 MB">
-  <!ENTITY mercurial-buildsize     "78 MB (with docs, add 1.0 GB for tests)">
-  <!ENTITY mercurial-time          "0.5 SBU (with docs, add 11 SBU for tests using -j4)">
+  <!ENTITY mercurial-md5sum        "0859029d0bb54bcf7c583c55680573cb">
+  <!ENTITY mercurial-size          "7.4 MB">
+  <!ENTITY mercurial-buildsize     "112 MB (with docs, add 1.1 GB for tests)">
+  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 17 SBU for tests using -j4)">
 ]>
 
@@ -76,8 +76,10 @@
     <bridgehead renderas="sect3">Mercurial Dependencies</bridgehead>
 
+    <!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="python2"/>
     </para>
+    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -90,9 +92,10 @@
       (runtime, to access ssh://... repositories),
     <xref linkend="pygments"/>,
+    <xref linkend="rust"/>,
     <xref linkend="subversion"/> (with Python bindings),
     <ulink url="https://launchpad.net/bzr">Bazaar</ulink>,
     <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>,
     <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
-    <ulink url="https://github.com/pyca/pyopenssl">pyOpenSSL</ulink>
+    <ulink url="https://www.pyopenssl.org/en/stable/">pyOpenSSL</ulink>
 
     </para>
@@ -105,5 +108,11 @@
   <sect2 role="installation">
     <title>Installation of Mercurial</title>
-    <!-- seems to have a development rust port -->
+    <!-- Rust port is now part of the standard tests -->
+
+    <para>
+      First, force the build system to use Python 3:
+    </para>
+
+<screen><userinput remap="pre">export PYTHON=python3</userinput></screen>
 
     <para>
@@ -118,12 +127,10 @@
     </para>
 
-<screen remap="doc"><userinput>2to3 -w doc/hgmanpage.py &amp;&amp;
-PYTHON=python3 make doc</userinput></screen>
+<screen remap="doc"><userinput>make doc</userinput></screen>
 
     <para>
       To run the test suite, issue:
     </para>
-<screen remap="test"><userinput>rm -rf tests/tmp &amp;&amp;
-TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
+<screen remap="test"><userinput>TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
 <!-- The blacklists have to be checked every release of Mercurial, do a listing
      of tests/blacklists, but do not include the makefile. -->
@@ -150,6 +157,5 @@
       seems to be a problem with the test suite. If this happens, normally,
       from now on, there will be no more such failures whether you use the
-      debug switch or not. Three tests, test-alias.t, test-install.t, and
-      test-bundle2-exchange.t (intermittently), are known to fail.
+      debug switch or not. One test, test-doctest.py, is known to fail.
     </para>
 
@@ -176,4 +182,10 @@
 <screen role="root"
         remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
+
+    <para>
+      Next, clean up the environment variable set earlier:
+    </para>
+
+<screen><userinput>unset PYTHON</userinput></screen>
 
     <para>
@@ -198,4 +210,5 @@
   </sect2>
 
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -207,5 +220,7 @@
       </para>
 
-  </sect2>
+   </sect2>
+-->
+   
   <sect2 role="configuration">
     <title>Configuring Mercurial</title>
@@ -265,9 +280,9 @@
         <seg>
           several internal modules under
-          /usr/lib/python&python2-majorver;/site-packages/mercurial
+          /usr/lib/python&python3-majorver;/site-packages/mercurial
         </seg>
         <seg>
           /etc/mercurial and
-          /usr/lib/python&python2-majorver;/site-packages/{hgdemandimport,hgext,hgext3rd,mercurial}
+          /usr/lib/python&python3-majorver;/site-packages/{hgdemandimport,hgext,hgext3rd,mercurial}
         </seg>
       </seglistitem>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8ddf6d5c80706bdf4b45a3c2964268b5f1b5688b)
+++ introduction/welcome/changelog.xml	(revision d44531659d0be76785e2349014c8f4ce6dda333d)
@@ -46,4 +46,12 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Update to Mercurial-5.4. Fixes
+          <ulink url="&blfs-ticket-root;13491">#13491</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to nss-3.52. Fixes
+          <ulink url="&blfs-ticket-root;13489">#13489</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[thomas] - Upgrade xterm-355. Fixes
           <ulink url="&blfs-ticket-root;13492">#13492</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 8ddf6d5c80706bdf4b45a3c2964268b5f1b5688b)
+++ packages.ent	(revision d44531659d0be76785e2349014c8f4ce6dda333d)
@@ -29,7 +29,7 @@
 
 <!ENTITY nss-minor-version            "51">
-<!ENTITY nss-micro-version            "1">
-<!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">
-<!--<!ENTITY nss-version                  "3.&nss-minor-version;">-->
+<!ENTITY nss-micro-version            "0">
+<!--<!ENTITY nss-version                  "3.&nss-minor-version;.&nss-micro-version;">-->
+<!ENTITY nss-version                  "3.&nss-minor-version;">
 <!ENTITY openssh-version              "8.2p1">
 <!-- <!ENTITY openssl-version              "1.1.0g"> -->
@@ -338,5 +338,5 @@
 <!ENTITY lua-version                  "5.3.5">
 <!ENTITY lua52-version                "5.2.4">
-<!ENTITY mercurial-version            "5.3.2">
+<!ENTITY mercurial-version            "5.4">
 <!ENTITY nasm-version                 "2.14.02">
 <!ENTITY ninja-version                "1.9.0">
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 8ddf6d5c80706bdf4b45a3c2964268b5f1b5688b)
+++ postlfs/security/nss.xml	(revision d44531659d0be76785e2349014c8f4ce6dda333d)
@@ -9,15 +9,15 @@
 
 <!-- micro versions -->
-<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">
-
-<!-- no micro versions
-<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz"> -->
+<!--<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">-->
+
+<!-- no micro versions -->
+  <!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz">
 
   <!ENTITY nss-download-ftp " ">
-  <!ENTITY nss-md5sum        "6acaf1ddff69306ae30a908881c6f233">
+  <!ENTITY nss-md5sum        "b28ac9330eefd5b25be661748aad75c0">
   <!ENTITY nss-size          "75 MB">
   <!-- 50 MB increase is due to new test files, see #12187 -->
-  <!ENTITY nss-buildsize     "268 MB">
-  <!ENTITY nss-time          "4.2 SBU">
+  <!ENTITY nss-buildsize     "294 MB">
+  <!ENTITY nss-time          "5.2 SBU">
 ]>
 
@@ -252,6 +252,7 @@
         <seg>
           libcrmf.a, libfreebl3.so, libfreeblpriv3.so, libgtest1.so, 
-          libgtestutil.so, libnss3.so, libnssckbi.so, libnssdbm3.so, 
-          libnsssysinit.so, libnssutil3.so, libsmime3.so, libsoftokn3.so, 
+          libgtestutil.so, libnss3.so, libnssckbi.so, libnssckbi-testlib.so,
+          libnssdbm3.so, libnsssysinit.so, libnssutil3.so, 
+          libpkcs11testmodule.so, libsmime3.so, libsoftokn3.so, 
           and libssl3.so
         </seg>
