diff --git a/general.ent b/general.ent
index 80b401fb17..0b499f5081 100644
--- a/general.ent
+++ b/general.ent
@@ -388,7 +388,7 @@ export -f as_root</userinput></screen>
 <!ENTITY librep-version               "0.92.3">
 <!ENTITY llvm-version                 "3.4.2">
 <!ENTITY lua-version                  "5.2.3">
-<!ENTITY mercurial-version            "3.0.1">
+<!ENTITY mercurial-version            "3.0.2">
 <!ENTITY nasm-version                 "2.11.05">
 <!ENTITY npapi-sdk-version            "0.27.2">
 <!ENTITY php-version                  "5.5.14">
diff --git a/general/prog/mercurial.xml b/general/prog/mercurial.xml
index db52541814..b70e5d26e9 100644
--- a/general/prog/mercurial.xml
+++ b/general/prog/mercurial.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY mercurial-download-http "http://mercurial.selenic.com/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "15de301a673b77f839325dba10ed4fc0">
+  <!ENTITY mercurial-md5sum        "c5be4265745a8140fec777a4dfc40e0e">
   <!ENTITY mercurial-size          "3.8 MB">
-  <!ENTITY mercurial-buildsize     "43 MB (additional 2MB for the tests and 2 MB for docs generation)
+  <!ENTITY mercurial-buildsize     "43 MB (additional 249 MB for the tests and 2 MB for docs generation)
 
 ">
   <!ENTITY mercurial-time          "less than 0.1 SBU (additional 7.9 SBU for tests)">
@@ -70,12 +70,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink url="http://docutils.sourceforge.net/">Docutils</ulink> (required to build the documentation),
+    <xref linkend="bazaar"/>,
+    <xref linkend="cvs"/>,
     <xref linkend="git"/>,
     <xref linkend="gnupg2"/> (<command>gpg2</command> with Python bindings),
     <xref linkend="subversion"/> (with Python bindings),
-    <xref linkend="bazaar"/>,
-    <xref linkend="cvs"/>,
+    <ulink url="http://docutils.sourceforge.net/">Docutils</ulink> (required to build the documentation),
     <ulink url="http://pypi.python.org/pypi/pyflakes">pyflakes</ulink>,
     <ulink url="http://pygments.org/">pygments</ulink>, and
     <ulink url="https://launchpad.net/pyopenssl">pyOpenSSL</ulink>
@@ -100,10 +100,21 @@
 
 <screen><userinput>make doc</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>. During the
-    tests, the build directory size increases above the
-    <quote>Estimated disk space required</quote>, even when considering the
-    additional values, due to temporary test files.</para>
+    <para>In the test suite, failure of test-patchbomb is expected with
+    <application>Python-2.7.x</application> (x &gt; 7). To test the results in
+    the subdiretory <filename class="directory">tmp</filename>, blacklisting
+    this test, issue:</para>
+
+<screen><userinput>cat &gt; tests/blacklists/test-failed &lt;&lt; "EOF"
+<literal># Failure with Python-2.7.8
+  test-patchbomb.t</literal>
+EOF
+rm -rf tests/tmp &amp;&amp;
+TESTFLAGS="--tmpdir tmp --blacklist blacklists/test-failed" \
+make check</userinput></screen>
+
+    <para>Tests may be run in parallel, just add
+    <quote>-j$(getconf _NPROCESSORS_ONLN)</quote> to TESTFLAGS.</para>
 
     <para>Install <application>Mercurial</application> by running
     the following command (as <systemitem class="username">root</systemitem>):</para>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ecf2d27179..77316fa58c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>July 2nd, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to mercurial-3.0.2. Fixes
+          <ulink url="&blfs-ticket-root;5227">#5227</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to texlive-20140525 and current (20140628)
           version of install-tl-unx.