Index: general.ent
===================================================================
--- general.ent	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ general.ent	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "20">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "01">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "January 20th, &year;">
+<!ENTITY releasedate  "January 23rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ introduction/welcome/changelog.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -45,4 +45,43 @@
 -->
    <listitem>
+      <para>January 23rd, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to Sudo-1.8.15. Merged from trunk r16594.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to stunnel-5.29. Merged from trunk r16797.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to ssh-askpass-4.1p2. Merged from trunk r16811.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to p11-kit-0.23.2. Merged from trunk r16716.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to OpenSSL-1.0.2e. Merged from trunk r16708.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to OpenSSH-7.1p2. Merged from trunk r16811.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to NSS-3.21. Merged from trunk r16627.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to MIT Kerberos V1.14. Merged from trunk r16679.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to iptables-1.6.0. Merged from trunk r16742.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to GPGME-1.6.0. Merged from trunk r16360.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to GnuTLS-3.4.8. Merged from trunk r16797.</para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>January 20th, 2016</para>
       <itemizedlist>
Index: packages.ent
===================================================================
--- packages.ent	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ packages.ent	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -14,14 +14,14 @@
 <!ENTITY cyrus-sasl-version           "2.1.26">
 <!ENTITY gnupg2-version               "2.1.10">
-<!ENTITY gnutls-version               "3.4.5">
-<!ENTITY gpgme-version                "1.5.5">
+<!ENTITY gnutls-version               "3.4.8">
+<!ENTITY gpgme-version                "1.6.0">
 <!ENTITY haveged-version              "1.9.1">
-<!ENTITY iptables-version             "1.4.21">
+<!ENTITY iptables-version             "1.6.0">
 <!ENTITY libcap-version               "2.24">
 <!ENTITY linux-pam-version            "1.2.1">
-<!ENTITY mitkrb-major-version         "1.13">
-<!ENTITY mitkrb-version               "&mitkrb-major-version;.2">
+<!ENTITY mitkrb-major-version         "1.14">
+<!ENTITY mitkrb-version               "&mitkrb-major-version;">
 <!ENTITY nettle-version               "3.1.1">
-<!ENTITY nss-minor-version            "20">
+<!ENTITY nss-minor-version            "21">
 <!ENTITY nss-micro-version            "">
 <!-- normal-->
@@ -29,12 +29,12 @@
 <!-- major and minor only -->
 <!ENTITY nss-version                  "3.&nss-minor-version;">
-<!ENTITY openssh-version              "7.1p1">
-<!ENTITY openssl-version              "1.0.2d">
-<!ENTITY p11-kit-version              "0.23.1">    <!-- Even minors only -->
+<!ENTITY openssh-version              "7.1p2">
+<!ENTITY openssl-version              "1.0.2e">
+<!ENTITY p11-kit-version              "0.23.2">    <!-- Even minors only -->
 <!ENTITY polkit-version               "0.113">
 <!ENTITY shadow-version               "4.2.1">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
-<!ENTITY stunnel-version              "5.23">
-<!ENTITY sudo-version                 "1.8.14p3">
+<!ENTITY stunnel-version              "5.29">
+<!ENTITY sudo-version                 "1.8.15">
 <!ENTITY tripwire-version             "2.4.2.2">
 
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/gnutls.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -7,8 +7,8 @@
   <!ENTITY gnutls-download-http " ">
   <!ENTITY gnutls-download-ftp  "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-&gnutls-version;.tar.xz">
-  <!ENTITY gnutls-md5sum        "f5dae0e0ecda28aab12386e6c0705d4c">
-  <!ENTITY gnutls-size          "6.3 MB">
-  <!ENTITY gnutls-buildsize     "147 MB (with tests)">
-  <!ENTITY gnutls-time          "4.3 SBU (with tests)">
+  <!ENTITY gnutls-md5sum        "a26e6dd8d5ad92016e3f068795b89624">
+  <!ENTITY gnutls-size          "6.4 MB">
+  <!ENTITY gnutls-buildsize     "128 MB (144 MB with tests)">
+  <!ENTITY gnutls-time          "0.8 SBU (4.3 SBU with tests)">
 ]>
 
@@ -142,4 +142,7 @@
     <para>
       To test the results, issue: <command>make check</command>.
+      If a prior version of <application>GnuTLS</application> has been installed, some
+      tests may fail. If <filename>/usr/lib/libgnutls.so</filename> is removed,
+      all tests sould pass. The installation procedure restores <filename>libgnutls.so</filename>.
     </para>
 
@@ -175,4 +178,5 @@
       <xref linkend="cacerts"/>.
     </para>
+
     <para>
       <option>--enable-openssl-compatibility</option>: Use this switch if you
@@ -197,9 +201,19 @@
       <seglistitem>
         <seg>
-          certtool, crywrap, danetool, gnutls-cli, gnutls-cli-debug,
-          gnutls-serv, ocsptool, p11tool, psktool, and srptool
+          certtool, 
+          crywrap, 
+          danetool, 
+          gnutls-cli, 
+          gnutls-cli-debug,
+          gnutls-serv, 
+          ocsptool, 
+          p11tool, 
+          psktool, 
+          and srptool
         </seg>
         <seg>
-          libgnutls.so, libgnutls-dane.so, libgnutlsxx.so, and
+          libgnutls.so, 
+          libgnutls-dane.so, 
+          libgnutlsxx.so, and
           guile-gnutls-v-2.so (<application>Guile</application> Module)
         </seg>
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/gpgme.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -7,8 +7,8 @@
   <!ENTITY gpgme-download-http " ">
   <!ENTITY gpgme-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-&gpgme-version;.tar.bz2">
-  <!ENTITY gpgme-md5sum        "a56df7028a0814ef57d77262898ca040">
-  <!ENTITY gpgme-size          "956 KB">
-  <!ENTITY gpgme-buildsize     "23 MB">
-  <!ENTITY gpgme-time          "0.2 SBU">
+  <!ENTITY gpgme-md5sum        "60d730d22e8065fd5de309e8b98e304b">
+  <!ENTITY gpgme-size          "964 KB">
+  <!ENTITY gpgme-buildsize     "23 MB (without the test suite)">
+  <!ENTITY gpgme-time          "0.2 SBU (without the test suite)">
 ]>
 
@@ -126,8 +126,10 @@
       <seglistitem>
         <seg>
-          gpgme-config and gpgme-tool
+          gpgme-config
+          and gpgme-tool
         </seg>
         <seg>
-          libgpgme-pthread.so and libgpgme.so
+          libgpgme-pthread.so 
+          and libgpgme.so
         </seg>
         <seg>
Index: postlfs/security/iptables-systemd.xml
===================================================================
--- postlfs/security/iptables-systemd.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/iptables-systemd.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -7,8 +7,8 @@
   <!ENTITY iptables-download-http "http://www.netfilter.org/projects/iptables/files/iptables-&iptables-version;.tar.bz2">
   <!ENTITY iptables-download-ftp  "ftp://ftp.netfilter.org/pub/iptables/iptables-&iptables-version;.tar.bz2">
-  <!ENTITY iptables-md5sum        "536d048c8e8eeebcd9757d0863ebb0c0">
-  <!ENTITY iptables-size          "536 KB">
-  <!ENTITY iptables-buildsize     "15 MB">
-  <!ENTITY iptables-time          "0.2 SBU">
+  <!ENTITY iptables-md5sum        "27ba3451cb622467fc9267a176f19a31">
+  <!ENTITY iptables-size          "596 KB">
+  <!ENTITY iptables-buildsize     "19 MB">
+  <!ENTITY iptables-time          "0.1 SBU">
 ]>
 
@@ -72,4 +72,11 @@
       </listitem>
     </itemizedlist>
+
+    <bridgehead renderas="sect3">Iptables Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="http://www.netfilter.org/projects/nftables/index.html">nftables</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -130,4 +137,5 @@
 <screen><userinput>./configure --prefix=/usr   \
             --sbindir=/sbin \
+            --disable-nftables \
             --enable-libipq \
             --with-xtlibdir=/lib/xtables &amp;&amp;
@@ -153,7 +161,6 @@
 
     <para>
-      <parameter>--with-xtlibdir=/lib/xtables</parameter>: Ensure all
-      <application>Iptables</application> modules are installed in the
-      <filename class="directory">/lib/xtables</filename> directory.
+      <parameter>--disable-nftables</parameter>: This switch disables building
+      nftables compatibility. Omit this switch if you have installed nftables.
     </para>
 
@@ -167,4 +174,10 @@
       <option>--enable-nfsynproxy</option>: This switch enables installation
       of <application>nfsynproxy</application> SYNPROXY configuration tool.
+    </para>
+
+    <para>
+      <option>--with-xtlibdir=/lib/xtables</option>: Ensure all
+      <application>iptables</application> modules are installed in the
+      <filename class="directory">/lib/xtables</filename> directory.
     </para>
 
@@ -214,12 +227,23 @@
       <seglistitem>
         <seg>
-          ip6tables, ip6tables-restore, ip6tables-save, iptables, iptables-restore,
-          iptables-save, iptables-xml, nfsynproxy (optional) and xtables-multi
+          ip6tables, 
+          ip6tables-restore, 
+          ip6tables-save, 
+          iptables, 
+          iptables-restore,
+          iptables-save, 
+          iptables-xml, 
+          nfsynproxy (optional) and xtables-multi
         </seg>
         <seg>
-          libip4tc.so, libip6tc.so, libipq.so, libiptc.so, and libxtables.so
+          libip4tc.so, 
+          libip6tc.so, 
+          libipq.so, 
+          libiptc.so, 
+          and libxtables.so
         </seg>
         <seg>
-          /lib/xtables and /usr/include/libiptc
+          /lib/xtables 
+          and /usr/include/libiptc
         </seg>
       </seglistitem>
Index: postlfs/security/mitkrb-systemd.xml
===================================================================
--- postlfs/security/mitkrb-systemd.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/mitkrb-systemd.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY mitkrb-download-http "http://web.mit.edu/kerberos/www/dist/krb5/&mitkrb-major-version;/krb5-&mitkrb-version;-signed.tar">
+  <!ENTITY mitkrb-download-http "http://web.mit.edu/kerberos/dist/krb5/&mitkrb-major-version;/krb5-&mitkrb-version;.tar.gz">
   <!ENTITY mitkrb-download-ftp  " ">
-  <!ENTITY mitkrb-md5sum        "f7ebfa6c99c10b16979ebf9a98343189">
+  <!ENTITY mitkrb-md5sum        "0727968764d0208388b85ad31aafde24">
   <!ENTITY mitkrb-size          "12 MB">
-  <!ENTITY mitkrb-buildsize     "142 MB (Additional 28 MB for the testsuite)">
-  <!ENTITY mitkrb-time          "0.9 SBU (additional 5.0 SBU for the testsuite)">
+  <!ENTITY mitkrb-buildsize     "165 MB (Additional 26 MB for the testsuite)">
+  <!ENTITY mitkrb-time          "1 SBU (additional 5.5 SBU for the testsuite)">
 ]>
 
@@ -79,12 +79,9 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="bind-utils"/> (used during the testsuite),
       <xref linkend="dejagnu"/> (for full test coverage),
       <xref linkend="gnupg2"/> (to authenticate the package),
       <xref linkend="keyutils"/>,
       <xref linkend="openldap"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="python2"/> (used during the testsuite),
-      <xref linkend="tcl"/> and
+      <xref linkend="python2"/> (used during the testsuite), and
       <xref linkend="rpcbind"/> (used during the testsuite)
     </para>
@@ -107,7 +104,8 @@
     <title>Installation of MIT Kerberos V5</title>
 
+<!--
     <para>
       <application>MIT Kerberos V5</application> is distributed in a
-      TAR file containing a compressed TAR package and a detached PGP
+      TAR file containing a compressed TAR package and a detached PGP2
       <filename class="extension">ASC</filename> file. You'll need to unpack
       the distribution tar file, then unpack the compressed tar file before
@@ -122,5 +120,5 @@
     </para>
 
-<screen><userinput>gpg2 --verify krb5-&mitkrb-version;.tar.gz.asc krb5-&mitkrb-version;.tar.gz</userinput></screen>
+<screen><userinput>gpg2 -\-verify krb5-&mitkrb-version;.tar.gz.asc krb5-&mitkrb-version;.tar.gz</userinput></screen>
 
     <para>You will probably see output similar to:</para>
@@ -133,5 +131,5 @@
     </para>
 
-<screen><userinput>gpg2 --keyserver pgp.mit.edu --recv-keys 0055C305</userinput></screen>
+<screen><userinput>gpg2 -\-keyserver pgp.mit.edu -\-recv-keys 0055C305</userinput></screen>
 
     <para>
@@ -140,5 +138,5 @@
       with a trusted signature. Trusting the downloaded key is a separate
       operation but it is up to you to determine the level of trust.
-    </para>
+    </para>-->
 
     <para>
@@ -151,4 +149,8 @@
     -e "s@-lpython2.5]@&amp;,\n  AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \
     -i configure.in &amp;&amp;
+
+sed -e 's@\^u}@^u cols 300}@' \
+    -i tests/dejagnu/config/default.exp &amp;&amp;
+
 autoconf &amp;&amp;
 ./configure --prefix=/usr            \
@@ -157,5 +159,5 @@
             --with-system-et         \
             --with-system-ss         \
-            --without-system-verto   \
+            --with-system-verto=no   \
             --enable-dns-for-realm   &amp;&amp;
 make</userinput></screen>
@@ -179,15 +181,15 @@
 for LIBRARY in gssapi_krb5 gssrpc k5crypto kadm5clnt kadm5srv \
                kdb5 kdb_ldap krad krb5 krb5support verto ; do
-    [ -e  /usr/lib/lib$LIBRARY.so ] &amp;&amp; chmod -v 755 /usr/lib/lib$LIBRARY.so
+    chmod -v 755 /usr/lib/lib$LIBRARY.so 
 done &amp;&amp;
 unset LIBRARY &amp;&amp;
 
-mv -v /usr/lib/libkrb5.so.*        /lib &amp;&amp;
-mv -v /usr/lib/libk5crypto.so.*    /lib &amp;&amp;
-mv -v /usr/lib/libkrb5support.so.* /lib &amp;&amp;
-
-ln -sfv ../../lib/$(readlink /usr/lib/libkrb5.so)        /usr/lib/libkrb5.so        &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libk5crypto.so)    /usr/lib/libk5crypto.so    &amp;&amp;
-ln -sfv ../../lib/$(readlink /usr/lib/libkrb5support.so) /usr/lib/libkrb5support.so &amp;&amp;
+mv -v /usr/lib/libkrb5.so.3*        /lib &amp;&amp;
+mv -v /usr/lib/libk5crypto.so.3*    /lib &amp;&amp;
+mv -v /usr/lib/libkrb5support.so.0* /lib &amp;&amp;
+
+ln -sfv ../../lib/libkrb5.so.3.3        /usr/lib/libkrb5.so        &amp;&amp;
+ln -sfv ../../lib/libk5crypto.so.3.1    /usr/lib/libk5crypto.so    &amp;&amp;
+ln -sfv ../../lib/libkrb5support.so.0.1 /usr/lib/libkrb5support.so &amp;&amp;
 
 mv -v /usr/bin/ksu /bin &amp;&amp;
@@ -204,6 +206,8 @@
 
     <para>
-      <command>sed -e ...</command>: This <command>sed</command> fixes
-      <application>Python</application> detection.
+      <command>sed -e ...</command>: The first <command>sed</command> fixes
+      <application>Python</application> detection. The second one increases
+      the width of the virtual terminal used for some tests, to prevent
+      some spurious characters from being echoed, which is taken as a failure.
     </para>
 
@@ -228,9 +232,9 @@
 
     <para>
-      <parameter>--without-system-verto</parameter>: This switch causes
-      the build to use the internal version of <filename
-      class="libraryfile">libverto</filename> library in case older one
-      is present from previous <application>Kerberos</application>
-      installation.
+      <parameter>--with-system-verto=no</parameter>: This switch fixes a bug in
+      the package: it does not recognize its own verto library installed
+      previously. This is not a problem if you are reinstalling the same version.
+      However, if you are updating, the old library is used as the system library,
+      instead of installing the new version.
     </para>
 
@@ -488,15 +492,49 @@
       <seglistitem>
         <seg>
-          gss-client, gss-server, k5srvutil, kadmin, kadmin.local,
-          kadmind, kdb5_ldap_util (optional), kdb5_util, kdestroy, kinit, klist,
-          kpasswd, kprop, kpropd, kproplog, krb5-config, krb5kdc, krb5-send-pr,
-          ksu, kswitch, ktutil, kvno, sclient, sim_client, sim_server,
-          sserver, uuclient and uuserver
+          gss-client, 
+          gss-server, 
+          k5srvutil, 
+          kadmin, 
+          kadmin.local,
+          kadmind, 
+          kdb5_ldap_util (optional), 
+          kdb5_util, 
+          kdestroy, 
+          kinit, 
+          klist,
+          kpasswd, 
+          kprop, 
+          kpropd, 
+          kproplog, 
+          krb5-config, 
+          krb5kdc, 
+          krb5-send-pr,
+          ksu, 
+          kswitch, 
+          ktutil, 
+          kvno, 
+          sclient, 
+          sim_client, 
+          sim_server,
+          sserver, 
+          uuclient,
+          and uuserver
         </seg>
         <seg>
-          libgssapi_krb5.so, libgssrpc.so, libk5crypto.so, libkadm5clnt_mit.so,
-          libkadm5clnt.so, libkadm5srv_mit.so, libkadm5srv.so, libkdb_ldap.so
-          (optional), libkdb5.so, libkrad.so, libkrb5.so, libkrb5support.so, and
-          libverto.so
+          libgssapi_krb5.so, 
+          libgssrpc.so, 
+          libk5crypto.so, 
+          libkadm5clnt_mit.so,
+          libkadm5clnt.so, 
+          libkadm5srv_mit.so, 
+          libkadm5srv.so, 
+          libkdb_ldap.so
+          (optional), 
+          libkdb5.so, 
+          libkrad.so, 
+          libkrb5.so, 
+          libkrb5support.so,
+          libverto.so, 
+          and some plugins under the /usr/lib/krb5 tree
         </seg>
         <seg>
Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/nss.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -8,5 +8,5 @@
   <!ENTITY nss-url "ftp.mozilla.org/pub/mozilla.org/security/nss/releases">
 
-<!ENTITY nss-download-http "https://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz">
+<!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-download-ftp "ftp://&nss-url;/NSS_3_&nss-minor-version;_&nss-micro-version;_RTM/src/nss-&nss-version;.tar.gz"> -->
@@ -15,8 +15,8 @@
 <!ENTITY nss-download-ftp "ftp://&nss-url;/NSS_3_&nss-minor-version;_RTM/src/nss-&nss-version;.tar.gz"> -->
 
-  <!ENTITY nss-md5sum        "db83988499d1eb3b623d77ecf495b0f5">
-  <!ENTITY nss-size          "6.6 MB">
-  <!ENTITY nss-buildsize     "84 MB">
-  <!ENTITY nss-time          "0.8 SBU">
+  <!ENTITY nss-md5sum        "3c8b2ed880dd3a8d86c9e0151afe6eba">
+  <!ENTITY nss-size          "6.7 MB">
+  <!ENTITY nss-buildsize     "91 MB">
+  <!ENTITY nss-time          "0.9 SBU">
 ]>
 
@@ -211,10 +211,20 @@
       <seglistitem>
         <seg>
-          certutil, nss-config, and pk12util
+          certutil, 
+          nss-config, 
+          and pk12util
         </seg>
         <seg>
-          libcrmf.a, libfreebl3.so, libnss3.so, libnssckbi.so,
-          libnssdbm3.so, libnsssysinit.so, libnssutil3.so,
-          libsmime3.so, libsoftokn3.so, and libssl3.so
+          libcrmf.a, 
+          libfreebl3.so, 
+          libgtest1.so, 
+          libnss3.so, 
+          libnssckbi.so,
+          libnssdbm3.so, 
+          libnsssysinit.so, 
+          libnssutil3.so,
+          libsmime3.so, 
+          libsoftokn3.so, 
+          and libssl3.so
         </seg>
         <seg>
Index: postlfs/security/openssh-systemd.xml
===================================================================
--- postlfs/security/openssh-systemd.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/openssh-systemd.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -9,8 +9,8 @@
   <!ENTITY openssh-download-ftp
            "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
-  <!ENTITY openssh-md5sum        "8709736bc8a8c253bc4eeb4829888ca5">
-  <!ENTITY openssh-size          "1.4 MB">
-  <!ENTITY openssh-buildsize     "49 MB (additional 3 MB if running the tests)">
-  <!ENTITY openssh-time          "0.6 SBU (running the tests takes at least 10
+  <!ENTITY openssh-md5sum        "4d8547670e2a220d5ef805ad9e47acf2">
+  <!ENTITY openssh-size          "1.5 MB">
+  <!ENTITY openssh-buildsize     "43 MB (51 MB with the test suite)">
+  <!ENTITY openssh-time          "0.5 SBU (running the tests takes at least 10
                                   minutes, irrespective of processor speed)">
 ]>
@@ -92,5 +92,5 @@
       <xref linkend="mitkrb"/>,
       <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>,
-      <ulink url="http://www.opensc-project.org/">OpenSC</ulink>, and
+      <ulink url="https://github.com/OpenSC/OpenSC/wiki">OpenSC</ulink>, and
       <ulink url="http://www.citi.umich.edu/projects/smartcard/sectok.html">libsectok</ulink>
     </para>
@@ -351,6 +351,14 @@
       <seglistitem>
         <seg>
-          scp, sftp, slogin (symlink to ssh), ssh, ssh-add, ssh-agent,
-          ssh-copy-id, ssh-keygen, ssh-keyscan, and sshd
+          scp, 
+          sftp, 
+          slogin (symlink to ssh), 
+          ssh, 
+          ssh-add, 
+          ssh-agent,
+          ssh-copy-id, 
+          ssh-keygen, 
+          ssh-keyscan, 
+          and sshd
         </seg>
         <seg>
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/openssl.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -9,8 +9,8 @@
   <!ENTITY openssl-download-ftp
            "ftp://ftp.openssl.org/source/openssl-&openssl-version;.tar.gz">
-  <!ENTITY openssl-md5sum        "38dd619b2e77cbac69b99f52a053d25a">
-  <!ENTITY openssl-size          "5 MB">
-  <!ENTITY openssl-buildsize     "60 MB">
-  <!ENTITY openssl-time          "1.4 SBU">
+  <!ENTITY openssl-md5sum        "5262bfa25b60ed9de9f28d5d52d77fc5">
+  <!ENTITY openssl-size          "5.1 MB">
+  <!ENTITY openssl-buildsize     "68 MB (with tests)">
+  <!ENTITY openssl-time          "1.4 SBU (with tests)">
 ]>
 
@@ -116,5 +116,5 @@
 
     <para>
-      To test the results, issue: <command>make -j1 test</command>.
+      To test the results, issue: <command>make test</command>.
     </para>
 
@@ -221,8 +221,10 @@
       <seglistitem>
         <seg>
-          c_rehash and openssl
+          c_rehash 
+          and openssl
         </seg>
         <seg>
-          libcrypto.{so,a} and libssl.{so,a}
+          libcrypto.{so,a} 
+          and libssl.{so,a}
         </seg>
         <seg>
Index: postlfs/security/p11-kit.xml
===================================================================
--- postlfs/security/p11-kit.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/p11-kit.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -7,8 +7,8 @@
   <!ENTITY p11-kit-download-http "http://p11-glue.freedesktop.org/releases/p11-kit-&p11-kit-version;.tar.gz">
   <!ENTITY p11-kit-download-ftp  " ">
-  <!ENTITY p11-kit-md5sum        "96f073270c489c9a594e1c9413f42db8">
-  <!ENTITY p11-kit-size          "972 KB">
-  <!ENTITY p11-kit-buildsize     "70 MB">
-  <!ENTITY p11-kit-time          "0.4 SBU">
+  <!ENTITY p11-kit-md5sum        "738af2442331fc22f440df9bee9b062a">
+  <!ENTITY p11-kit-size          "1000 KB">
+  <!ENTITY p11-kit-buildsize     "73 MB (with tests)">
+  <!ENTITY p11-kit-time          "0.4 SBU (with tests)">
 ]>
 
Index: postlfs/security/ssh-askpass.xml
===================================================================
--- postlfs/security/ssh-askpass.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/ssh-askpass.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -9,7 +9,7 @@
   <!ENTITY ssh-askpass-download-ftp
     "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&ssh-askpass-version;.tar.gz">
-  <!ENTITY ssh-askpass-md5sum        "08f72de6751acfbd0892b5f003922701">
-  <!ENTITY ssh-askpass-size          "1.4 MB">
-  <!ENTITY ssh-askpass-buildsize     "8.0  MB">
+  <!ENTITY ssh-askpass-md5sum        "4d8547670e2a220d5ef805ad9e47acf2">
+  <!ENTITY ssh-askpass-size          "1.5 MB">
+  <!ENTITY ssh-askpass-buildsize     "8.2  MB">
   <!ENTITY ssh-askpass-time          "less than 0.1 SBU">
 ]>
@@ -155,5 +155,6 @@
       <seglistitem>
         <seg>
-          ssh-askpass (symlink) and gnome-ssh-askpass2
+          ssh-askpass (symlink)
+          and gnome-ssh-askpass2 in /usr/libexec/openssh.
         </seg>
         <seg>
Index: postlfs/security/stunnel-systemd.xml
===================================================================
--- postlfs/security/stunnel-systemd.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/stunnel-systemd.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -5,9 +5,10 @@
   %general-entities;
 
-  <!ENTITY stunnel-download-http "https://www.stunnel.org/downloads/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-download-ftp  "ftp://ftp.stunnel.org/stunnel/stunnel-&stunnel-version;.tar.gz">
-  <!ENTITY stunnel-md5sum        "55470899902f706e2cd39a614524ca1a">
-  <!ENTITY stunnel-size          "620 KB">
-  <!ENTITY stunnel-buildsize     "7.7 MB">
+<!--  <!ENTITY stunnel-download-http "https://www.stunnel.org/downloads/stunnel-&stunnel-version;.tar.gz"> -->
+  <!ENTITY stunnel-download-http " ">
+  <!ENTITY stunnel-download-ftp  "ftp://ftp.stunnel.org/archive/5.x/stunnel-&stunnel-version;.tar.gz">
+  <!ENTITY stunnel-md5sum        "bf4c13ea9705156abd04f1d766093ea">
+  <!ENTITY stunnel-size          "624 KB">
+  <!ENTITY stunnel-buildsize     "7.9 MB">
   <!ENTITY stunnel-time          "0.1 SBU">
 ]>
@@ -132,4 +133,16 @@
     <para>Install <application>stunnel</application> by running the following
     commands:</para>
+    
+    <note>
+      <para>For some systems with <application>Binutils</application>
+      versions prior to 2.25, <command>configure</command> may fail. If
+      necessary, fix it with: </para>
+
+<screen><userinput>sed -i '/LDFLAGS.*static_flag/ s/^ /#/' configure</userinput></screen>
+
+      <para>or, if <xref linkend="llvm"/> with Clang is installed, you can
+      replace <command>./configure ...</command> with <command>CC=clang
+      ./configure ...</command> in the first command below.</para>
+    </note>
 
 <screen><userinput>./configure --prefix=/usr        \
@@ -230,6 +243,5 @@
 ;TIMEOUTclose = 0</literal>
 
-EOF
-chmod -v 644 /etc/stunnel/stunnel.conf</userinput></screen>
+EOF</userinput></screen>
 
       <para>Finally, add the service(s) you wish to encrypt to the
@@ -281,10 +293,15 @@
 
       <seglistitem>
-        <seg>stunnel and stunnel3</seg>
-        <seg>libstunnel.so</seg>
+        <seg>
+          stunnel 
+          and stunnel3
+        </seg>
+        <seg>
+          libstunnel.so
+        </seg>
         <seg>/etc/stunnel,
-             /usr/lib/stunnel,
-             /usr/share/doc/stunnel-&stunnel-version;, and
-             /var/lib/stunnel</seg>
+           /usr/lib/stunnel,
+           /usr/share/doc/stunnel-&stunnel-version;, and
+           /var/lib/stunnel</seg>
       </seglistitem>
     </segmentedlist>
Index: postlfs/security/sudo.xml
===================================================================
--- postlfs/security/sudo.xml	(revision 2325e9ba8de4e0c61bb534dfbdfa9d1ee2f0f4fb)
+++ postlfs/security/sudo.xml	(revision 295ca0000396d8bef9962b4c0fd6ecc7352c7ade)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY sudo-download-http "http://www.sudo.ws/sudo/dist/sudo-&sudo-version;.tar.gz">
+  <!ENTITY sudo-download-http "http://www.sudo.ws/dist/sudo-&sudo-version;.tar.gz">
   <!ENTITY sudo-download-ftp  "ftp://ftp.sudo.ws/pub/sudo/sudo-&sudo-version;.tar.gz">
-  <!ENTITY sudo-md5sum        "93dbd1e47c136179ff1b01494c1c0e75">
-  <!ENTITY sudo-size          "2.5 MB">
-  <!ENTITY sudo-buildsize     "28 MB">
-  <!ENTITY sudo-time          "0.5 SBU">
+  <!ENTITY sudo-md5sum        "7cf6b9b76d0478a572432bed481dd7b5">
+  <!ENTITY sudo-size          "2.6 MB">
+  <!ENTITY sudo-buildsize     "34 MB (with tests)">
+  <!ENTITY sudo-time          "0.4 SBU (with tests)">
 ]>
 
@@ -84,7 +84,7 @@
       <command>sendmail</command> command),
       <ulink url="http://www.openafs.org/">AFS</ulink>,
-      <ulink url="http://www.fwtk.org/">FWTK</ulink>,
-      <ulink url="http://sourceforge.net/projects/opie/files/">Opie</ulink>, and
-      <ulink url="http://www.rsa.com/node.aspx?id=1156">SecurID</ulink>
+      <ulink url="http://www.fwtk.org/">FWTK</ulink>, and
+      <ulink url="http://sourceforge.net/projects/opie/files/">Opie</ulink>
+<!--      <ulink url="http://www.rsa.com/node.aspx?id=1156">SecurID</ulink> -->
     </para>
 
@@ -160,5 +160,5 @@
     <para>
       <option>--without-pam</option>: This switch avoids building 
-      <application>PAM</application> support when <application>PAM</application>       is installed on the system.
+      <application>PAM</application> support when <application>PAM</application> is installed on the system.
     </para>
 
@@ -276,9 +276,15 @@
       <seglistitem>
         <seg>
-          sudo, sudoedit (symlink), sudoreplay, and visudo
+          sudo, 
+          sudoedit (symlink), 
+          sudoreplay, 
+          and visudo
         </seg>
         <seg>
-          group_file.so, libsudo_util.so,
-          sudoers.so, sudo_noexec.so, and system_group.so
+          group_file.so, 
+          libsudo_util.so,
+          sudoers.so, 
+          sudo_noexec.so, 
+          and system_group.so
         </seg>
         <seg>
