diff --git a/general.ent b/general.ent
index a5821d98a7..9fb20ff965 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "24">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 24th &year;">
+<!ENTITY releasedate  "April 25th &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 891a2cd10c..fa4ee41113 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,19 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>April 25th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to p11-kit-0.23.5. Fixes
+          <ulink url="&blfs-ticket-root;9162">#9162</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Update to make-ca.sh-20170425.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>April 24th, 2017</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index e75be3a6b5..1ed546c704 100644
--- a/packages.ent
+++ b/packages.ent
@@ -22,7 +22,7 @@
 <!ENTITY linux-pam-version            "1.3.0">
 <!ENTITY linux-pam-docs-version       "1.2.0">
 <!ENTITY libpwquality-version         "1.3.0">
-<!ENTITY make-ca-version              "20170119">
+<!ENTITY make-ca-version              "20170425">
 <!ENTITY mitkrb-major-version         "1.15">
 <!ENTITY mitkrb-version               "1.15.1">
 <!ENTITY nettle-version               "3.3">
@@ -35,7 +35,7 @@
 
 <!ENTITY openssh-version              "7.5p1">
 <!ENTITY openssl-version              "1.0.2k">
-<!ENTITY p11-kit-version              "0.23.2">    <!-- Even minors only -->
+<!ENTITY p11-kit-version              "0.23.5">
 <!ENTITY polkit-version               "0.113+git_2919920+js38">
 <!ENTITY shadow-version               "4.4">
 <!ENTITY ssh-askpass-version          "&openssh-version;">
diff --git a/postlfs/security/cacerts.xml b/postlfs/security/cacerts.xml
index ca67ed7bae..257df5bb89 100644
--- a/postlfs/security/cacerts.xml
+++ b/postlfs/security/cacerts.xml
@@ -8,12 +8,12 @@
   <!ENTITY certpath              "/lib/ckfw/builtins/certdata.txt">
   <!ENTITY ca-bundle-download    "&sources-anduin-http;/other/certdata.txt">
   <!ENTITY ca-bundle-size        "1.6 MB">
-  <!ENTITY cacerts-buildsize     "4.7 MB (with all runtime deps)">
+  <!ENTITY cacerts-buildsize     "6.5 MB (with all runtime deps)">
   <!ENTITY cacerts-time          "0.2 SBU (with all runtime deps)">
 
   <!ENTITY make-ca-download      "&sources-anduin-http;/other/make-ca.sh-&make-ca-version;">
-  <!ENTITY make-ca-size          "11 KB">
-  <!ENTITY make-ca-md5sum        "cce9fa4713c4611d9e61f99de612a1e9">
+  <!ENTITY make-ca-size          "24 KB">
+  <!ENTITY make-ca-md5sum        "7af1f27ab651bb1cbad2445325bf2d91">
 ]>
 
 <sect1 id="cacerts" xreflabel="Certificate Authority Certificates">
@@ -90,8 +90,9 @@
 
    <bridgehead renderas="sect4">Optional (runtime)</bridgehead>
     <para role="optional">
-    <xref linkend="java"/> or <xref linkend="openjdk"/>, and
-    <xref linkend="nss"/></para>
+    <xref linkend="java"/> or <xref linkend="openjdk"/>,
+    <xref linkend="nss"/>, and
+    <xref linkend="p11-kit"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url='&blfs-wiki;/cacerts'/></para>
diff --git a/postlfs/security/p11-kit.xml b/postlfs/security/p11-kit.xml
index 2cca201dc9..d6d39c5ef1 100644
--- a/postlfs/security/p11-kit.xml
+++ b/postlfs/security/p11-kit.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY p11-kit-download-http "http://p11-glue.freedesktop.org/releases/p11-kit-&p11-kit-version;.tar.gz">
+  <!ENTITY p11-kit-download-http "https://github.com/p11-glue/p11-kit/releases/download/&p11-kit-version;/p11-kit-&p11-kit-version;.tar.gz">
   <!ENTITY p11-kit-download-ftp  " ">
-  <!ENTITY p11-kit-md5sum        "738af2442331fc22f440df9bee9b062a">
-  <!ENTITY p11-kit-size          "1000 KB">
-  <!ENTITY p11-kit-buildsize     "73 MB (with for tests)">
-  <!ENTITY p11-kit-time          "0.4 SBU (with for tests)">
+  <!ENTITY p11-kit-md5sum        "bb87896c30fb18ce15053225ca488384">
+  <!ENTITY p11-kit-size          "516 KB">
+  <!ENTITY p11-kit-buildsize     "192 MB (with tests)">
+  <!ENTITY p11-kit-time          "0.5 SBU (with tests)">
 ]>
 
 <sect1 id="p11-kit" xreflabel="p11-kit-&p11-kit-version;">
@@ -99,9 +99,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --with-trust-paths=/etc/pki/anchors &amp;&amp;
+<screen><userinput>./autogen.sh --prefix=/usr     \
+             --sysconfdir=/etc \
+             --with-trust-paths=/etc/pki/anchors &amp;&amp;
 make</userinput></screen>
 
     <para>