Index: general.ent
===================================================================
--- general.ent	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ general.ent	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -1,11 +1,11 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
-<!ENTITY month        "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 30th, &year;">
+<!ENTITY releasedate  "December 2nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ general/genlib/qca.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -93,5 +93,5 @@
     <para>Fix the location of the CA certificates:</para>
 
-<screen><userinput>sed -i 's@ca-bundle.pem@ca-bundle.crt@' CMakeLists.txt</userinput></screen>
+<screen><userinput>sed -i 's@cert.pem@certs/ca-bundle.crt@' CMakeLists.txt</userinput></screen>
 
     <para>Install <application>Qca</application> by running the following
Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ general/prog/mercurial.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -205,5 +205,5 @@
 cat &gt; /etc/mercurial/hgrc &lt;&lt; "EOF"
 <literal>[web]
-cacerts = /etc/ssl/ca-bundle.crt</literal>
+cacerts = /etc/pki/tls/certs/ca-bundle.crt</literal>
 EOF</userinput></screen>
 
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ general/prog/openjdk.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -241,5 +241,5 @@
                --with-version-pre=""        \
                --with-version-opt=""        \
-               --with-cacerts-file=/etc/ssl/java/cacerts &amp;&amp;
+               --with-cacerts-file=/etc/pki/tls/java/cacerts &amp;&amp;
 make images</userinput></screen>
 
@@ -394,8 +394,8 @@
 
     <para>
-      <parameter>--with-cacerts-file=/etc/ssl/java/cacerts</parameter>:
+      <parameter>--with-cacerts-file=/etc/pki/tls/java/cacerts</parameter>:
       Specifies where to find a <filename>cacerts</filename> file,
-      <filename>/etc/ssl/java/</filename> on a BLFS system. Otherwise, an empty
-      one is created. You can use the
+      <filename>/etc/pki/tls/java/</filename> on a BLFS system. Otherwise, an
+      empty one is created. You can use the
       <command>/usr/sbin/make-ca --force</command> command to generate it, once
       you have installed the Java binaries.
@@ -450,5 +450,5 @@
       </para>
 
-<screen role="root"><userinput>ln -sfv /etc/ssl/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
+<screen role="root"><userinput>ln -sfv /etc/pki/tls/java/cacerts /opt/jdk/lib/security/cacerts</userinput></screen>
 
       <para>
Index: gnome/platform/rest.xml
===================================================================
--- gnome/platform/rest.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ gnome/platform/rest.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -106,5 +106,5 @@
 
 <screen><userinput>./configure --prefix=/usr \
-    --with-ca-certificates=/etc/ssl/ca-bundle.crt &amp;&amp;
+    --with-ca-certificates=/etc/pki/tls/certs/ca-bundle.crt &amp;&amp;
 make</userinput></screen>
 
@@ -125,6 +125,6 @@
 
     <para>
-      <parameter>--with-ca-certificates=/etc/ssl/ca-bundle.crt</parameter>: This
-      switch sets the location of the BLFS certificate authority bundle.
+      <parameter>--with-ca-certificates=/etc/pki/tls/certs/ca-bundle.crt</parameter>: 
+      This switch sets the location of the BLFS certificate authority bundle.
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ introduction/welcome/changelog.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -43,4 +43,19 @@
 -->
     <listitem>
+      <para>December 2nd, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Update to make-ca-1.0. Fixes
+          <ulink url="&blfs-ticket-root;11401">#11401</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Use configuration from bash-completions package if
+          it is installed. Added bash-completion-2.8 to the BLFS wiki. Fixes
+          <ulink url="&blfs-ticket-root;11399">#11399</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 30th, 2018</para>
       <itemizedlist>
Index: networking/netlibs/curl.xml
===================================================================
--- networking/netlibs/curl.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ networking/netlibs/curl.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -262,5 +262,5 @@
 
     <para>
-      <option>--with-ca-bundle=/etc/ssl/ca-bundle.crt</option>: Use
+      <option>--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt</option>: Use
       this switch instead of <parameter>--with-ca-path</parameter> if
       building with <application>GnuTLS</application> support
Index: networking/netlibs/neon.xml
===================================================================
--- networking/netlibs/neon.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ networking/netlibs/neon.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -140,5 +140,5 @@
       <application>GnuTLS</application> usage when both are present,
       simply pass <option>--with-ssl=gnutls</option> and 
-      <option>--with-ca-bundle=/etc/ssl/ca-bundle.crt</option> to the
+      <option>--with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt</option> to the
       <command>configure</command> script.
     </para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ packages.ent	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -25,5 +25,5 @@
 <!ENTITY linux-pam-docs-version       "1.2.0">
 <!ENTITY libpwquality-version         "1.4.0">
-<!ENTITY make-ca-version              "0.9">
+<!ENTITY make-ca-version              "1.0">
 <!ENTITY mitkrb-major-version         "1.16">
 <!ENTITY mitkrb-version               "1.16.2">
Index: postlfs/config/profile.xml
===================================================================
--- postlfs/config/profile.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ postlfs/config/profile.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -68,4 +68,7 @@
     as an unprivileged user.</para>
   </note>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bash-shell-startup-files"/></para>
 
   <sect2 id="etc-profile-profile">
@@ -198,19 +201,44 @@
 # Import bash completion scripts
 
-for script in /etc/bash_completion.d/*.sh ; do
-        if [ -r $script ] ; then
-                . $script
-        fi
-done
+# If the bash-completion package is installed, use its configuration instead
+if [ -f /usr/share/bash-completion/bash_completion ]; then
+
+  # Check for interactive bash and that we haven't already been sourced.
+  if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_VERSINFO-}" ]; then
+
+    # Check for recent enough version of bash.
+    if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
+       [ ${BASH_VERSINFO[0]} -eq 4 -a ${BASH_VERSINFO[1]} -ge 1 ]; then
+       [ -r "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion" ] &amp;&amp; \
+            . "${XDG_CONFIG_HOME:-$HOME/.config}/bash_completion"
+       if shopt -q progcomp &amp;&amp; [ -r /usr/share/bash-completion/bash_completion ]; then
+          # Source completion code.
+          . /usr/share/bash-completion/bash_completion
+       fi
+    fi
+  fi
+
+else
+
+  # bash-completions are not installed, use only bash completion directory
+  if shopt -q progcomp; then
+    for script in /etc/bash_completion.d/* ; do
+      if [ -r $script ] ; then
+        . $script
+      fi
+    done
+  fi
+fi
+
 # End /etc/profile.d/bash_completion.sh</literal>
 EOF</userinput></screen>
-
       <para>Make sure that the directory exists:</para>
 
 <screen role="root"><userinput>install --directory --mode=0755 --owner=root --group=root /etc/bash_completion.d</userinput></screen>
 
-    </sect3>
-
-
+      <para>For a more complete installation, see
+      <ulink url="&blfs-wiki;/bash-shell-startup-files#bash-completions"/>.</para>
+
+    </sect3>
 
     <sect3 id="etc-profile.d-dircolors.sh">
Index: postlfs/security/gnutls.xml
===================================================================
--- postlfs/security/gnutls.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ postlfs/security/gnutls.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -188,5 +188,5 @@
 
     <para>
-      <option>--with-default-trust-store-file=/etc/ssl/ca-bundle.crt</option>:
+      <option>--with-default-trust-store-file=/etc/pki/tls/certs/ca-bundle.crt</option>:
       This switch tells <command>configure</command> where to find the
       legacy CA certificate bundle and to use it instead of PKCS #11 module
Index: postlfs/security/make-ca.xml
===================================================================
--- postlfs/security/make-ca.xml	(revision 49cbcfeeeb6040a8587774ec670e4d7dd62b8eb9)
+++ postlfs/security/make-ca.xml	(revision 5c3f3856049d0d2f9da50a30ee160ba1340270fd)
@@ -10,7 +10,7 @@
   <!ENTITY make-ca-time          "0.1 SBU (with all runtime deps)">
 
-  <!ENTITY make-ca-download      "https://github.com/djlucas/make-ca/archive/v&make-ca-version;/make-ca-&make-ca-version;.tar.gz">
-  <!ENTITY make-ca-size          "36 KB">
-  <!ENTITY make-ca-md5sum        "0eeaf712eedeae4fa55d8bfa37f4ca32">
+  <!ENTITY make-ca-download      "https://github.com/djlucas/make-ca/releases/download/v&make-ca-version;/make-ca-&make-ca-version;.tar.xz">
+  <!ENTITY make-ca-size          "28 KB">
+  <!ENTITY make-ca-md5sum        "b038d38233f970aad60c29dfc0502021">
 ]>
 
@@ -145,8 +145,5 @@
     As the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install                             &amp;&amp;
-mkdir -pv /etc/pki/tls/certs             &amp;&amp;
-ln -svf /etc/ssl/ca-bundle.crt \
-        /etc/pki/tls/certs/ca-bundle.crt</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
    <para>As the <systemitem class="username">root</systemitem> user, after
@@ -164,4 +161,14 @@
 <screen role="root"><userinput>/usr/sbin/make-ca -g</userinput></screen>
 
+    <!-- Remove at 8.5 or 9.0 -->
+    <para>Previous version of BLFS used the path
+    <filename>/etc/ssl/ca-bundle.crt</filename> for the
+    <xref linkend="gnutls"/> certificate store. If software is still installed
+    that references this file, create a compatibilty symlink for the old
+    location as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="nodump"><userinput>ln -sfv /etc/pki/tls/certs/ca-bundle.crt \
+        /etc/ssl/ca-bundle.crt</userinput></screen>
+
     <para>You should periodically update the store with the above command
     either manually, or via a <phrase revision="sysv">cron job.</phrase>
@@ -170,40 +177,24 @@
     will check for updates weekly.</phrase></para>
 
-    <para>The default <filename>certdata.txt</filename> file provided by make-ca
+  </sect2>
+
+  <sect2 role="configuration" id="make-ca-config">
+    <title>Configuring make-ca</title>
+
+    <para>Genearally, no configuration is necessary on an LFS system, however,
+    the default <filename>certdata.txt</filename> file provided by make-ca
     is obtained from the mozilla-release branch, and is modified to provide a
-    Mercurial revision. This will be the correct version for most
-    systems. There are, however, several other variants of the file available
-    for use that might be preferred for one reason or another, including the
-    files shipped with Mozilla products in this book. RedHat and OpenSUSE,
-    for instance, use the version included in <xref linkend="nss"/>. Additional
-    upstream downloads are available at the links below.</para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Mozilla Release (the version provided by BLFS):
-        <ulink url="&certhost;releases/mozilla-release/raw-file/default/security/nss&certpath;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>NSS (this is the latest available version):
-        <ulink url="&certhost;projects/nss/raw-file/tip&certpath;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Mozilla Central:
-        <ulink url="&certhost;mozilla-central/raw-file/default/security/nss&certpath;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Mozilla Beta:
-        <ulink url="&certhost;releases/mozilla-beta/raw-file/default/security/nss&certpath;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Mozilla Aurora:
-        <ulink url="&certhost;releases/mozilla-aurora/raw-file/default/security/nss&certpath;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
+    Mercurial revision. This will be the correct version for most systems.
+    There are several other variants of the file available for use that might
+    be preferred for one reason or another, including the files shipped with
+    Mozilla products in this book. RedHat and OpenSUSE, for instance, use the
+    version included in <xref linkend="nss"/>. Additional upstream downloads
+    are available at the links included in
+    <filename>/etc/make-ca.conf.dist</filename>. Simply copy the file to
+    <filename>/etc/make-ca.conf</filename> and edit as appropriate.</para>
+
+    <indexterm zone="make-ca make-ca-config">
+      <primary sortas="e-etc-make-ca-conf">/etc/make-ca.conf</primary>
+    </indexterm>
 
   </sect2>
@@ -214,10 +205,8 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>make-ca</seg>
-        <seg>None</seg>
         <seg>/etc/ssl/{certs,java,local} and /etc/pki/{nssdb,anchors}</seg>
       </seglistitem>
