diff --git a/general.ent b/general.ent
index 1933d999b0..45e1a8d18f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "14">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 11th &year;">
+<!ENTITY releasedate  "September 14th &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 45f412e833..05d70079a0 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,16 @@
 
 -->
 
+    <listitem>
+      <para>September 14th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gnutls-3.5.4. Fixes
+          <ulink url="&blfs-ticket-root;8281">#8281</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>September 11th, 2016</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index a8e3ac3a0e..e49ddb4a72 100644
--- a/packages.ent
+++ b/packages.ent
@@ -13,7 +13,7 @@
 <!ENTITY cracklib-version             "2.9.6">
 <!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg2-version               "2.1.15">
-<!ENTITY gnutls-version               "3.5.3">
+<!ENTITY gnutls-version               "3.5.4">
 <!ENTITY gpgme-version                "1.6.0">
 <!ENTITY haveged-version              "1.9.1">
 <!ENTITY iptables-version             "1.6.0">
diff --git a/postlfs/security/gnutls.xml b/postlfs/security/gnutls.xml
index 01af3ef9e7..9827d5eeb7 100644
--- a/postlfs/security/gnutls.xml
+++ b/postlfs/security/gnutls.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "6c2c7f40ddf52933ee3ca474cb8cb63c">
+  <!ENTITY gnutls-md5sum        "c17e20d0f6b040580df57f5f94e3610f">
   <!ENTITY gnutls-size          "6.6 MB">
-  <!ENTITY gnutls-buildsize     "140 MB (add 30 MB for tests)">
-  <!ENTITY gnutls-time          "1.5 SBU (add 8.1 SBU for tests)">
+  <!ENTITY gnutls-buildsize     "140 MB (add 33 MB for tests)">
+  <!ENTITY gnutls-time          "1.5 SBU (add 8.0 SBU for tests)">
 ]>
 
 <sect1 id="gnutls" xreflabel="GnuTLS-&gnutls-version;">
@@ -114,6 +114,7 @@
       <xref linkend="unbound"/> (to build the DANE library),
       <xref linkend="valgrind"/> (used during the test suite),
       <ulink url="http://ftp.gnu.org/gnu/autogen/">autogen</ulink>,
+      <ulink url="https://cmocka.org/">cmocka</ulink>,
       <ulink url="http://ftp.debian.org/debian/pool/main/d/datefudge/">datefudge</ulink> (used during the test suite), and
       <ulink url="http://sourceforge.net/projects/trousers/files/trousers/">Trousers</ulink> (Trusted Platform Module support)
     </para>
@@ -205,7 +206,7 @@ make</userinput></screen>
 
       <seglistitem>
         <seg>
-          certtool, crywrap, danetool, gnutls-cli, gnutls-cli-debug,
+          certtool, danetool, gnutls-cli, gnutls-cli-debug,
           gnutls-serv, ocsptool, p11tool, psktool, and srptool
         </seg>
         <seg>
@@ -214,7 +215,7 @@ make</userinput></screen>
           /usr/lib/guile/2.0/guile-gnutls-v-2.so
         </seg>
         <seg>
-          /usr/{include,share/gtk-doc/html,share/guile/site}/gnutls
+          /usr/{include,share/gtk-doc/html,share/guile/site/2.0}/gnutls
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -236,7 +237,8 @@ make</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
+      Removed after 3.5.0 according to the NEWS file.
       <varlistentry id="crywrap">
         <term><command>crywrap</command></term>
         <listitem>
@@ -250,6 +252,7 @@ make</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry id="danetool">
         <term><command>danetool</command></term>