diff --git a/general.ent b/general.ent
index 2d3bb94895..c8ceeba3ff 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 21st, &year;">
+<!ENTITY releasedate  "May 22st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 28ec2f2a35..6c4eb7d234 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>May 22st, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - GnuPG 2.1.3 and 4: openpgp tests might fail. Fixes
+          <ulink url="&blfs-ticket-root;6479">#6479</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 21st, 2015</para>
       <itemizedlist>
diff --git a/postlfs/security/gnupg2.xml b/postlfs/security/gnupg2.xml
index 77a754f4dc..1cb63c8e8f 100644
--- a/postlfs/security/gnupg2.xml
+++ b/postlfs/security/gnupg2.xml
@@ -98,16 +98,23 @@
 
     <warning>
       <para>
-        If you are upgrading from gnupg prior to version 2.1, be sure to backup
-        <filename class="directory">~/.gnupg</filename>, because some
-        additional configuration will probably be necessary, and you could
-        lose your keys. You can find instructions at
+        If you are upgrading from gnupg prior to version 2.1, upstream
+        developers recommend to backup
+        <filename class="directory">~/.gnupg</filename>, because some additional
+        configuration will probably be necessary, and you could lose your keys.
+        You can find instructions at
         <ulink url="http://jo-ke.name/wp/?p=111"></ulink> and
         <ulink url="https://wiki.archlinux.org/index.php/GnuPG#.22Lost.22_keys.2C_upgrading_to_gnupg_version_2.1"></ulink>.
       </para>
-
     </warning>
 
+    <para>If the top directory path where the source is unpacked contains
+    symbolic links, the openpgp tests might fail. If this is your case and
+    you wish to run the test suite, fix that with:</para>
+
+<screen><userinput>sed -e 's|\(GNUPGHOME\)=\$(abs_builddir)|\1=`/bin/pwd`|' \
+    -i tests/openpgp/Makefile.in</userinput></screen>
+
     <para>Install <application>GnuPG</application> by running the following
     commands:</para>