Index: general.ent
===================================================================
--- general.ent	(revision 796bc6630a31c633833328155e5fc9a33b7d8544)
+++ general.ent	(revision 18a65e61f0c3c81458331cdddf13ad1aa2cb42e6)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "17">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 17th, &year;">
+<!ENTITY releasedate  "August 18th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision 796bc6630a31c633833328155e5fc9a33b7d8544)
+++ general/prog/cmake.xml	(revision 18a65e61f0c3c81458331cdddf13ad1aa2cb42e6)
@@ -7,5 +7,5 @@
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "ab4aa7df9301c94cdd6f8ee4fe66458b">
+  <!ENTITY cmake-md5sum        "10109246a51102bfda45ff3935275fbf">
   <!ENTITY cmake-size          "7.7 MB">
   <!ENTITY cmake-buildsize     "400 MB (add 416 MB for tests)">
Index: general/prog/llvm.xml
===================================================================
--- general/prog/llvm.xml	(revision 796bc6630a31c633833328155e5fc9a33b7d8544)
+++ general/prog/llvm.xml	(revision 18a65e61f0c3c81458331cdddf13ad1aa2cb42e6)
@@ -8,16 +8,16 @@
   <!ENTITY llvm-download-http "http://llvm.org/releases/&llvm-version;/llvm-&llvm-version;.src.tar.xz">
   <!ENTITY llvm-download-ftp  " ">
-  <!ENTITY llvm-md5sum        "788a11a35fa62eb008019b37187d09d2">
-  <!ENTITY llvm-size          "24 MB">
-  <!ENTITY llvm-buildsize     "2.4 GB (with Clang, add 10.8 GB for tests)">
-  <!ENTITY llvm-time          "24 SBU (with Clang and parallelism=4, add 16 SBU for tests)">
+  <!ENTITY llvm-md5sum        "c88c98709300ce2c285391f387fecce0">
+  <!ENTITY llvm-size          "24.1 MB">
+  <!ENTITY llvm-buildsize     "2.8 GB (with Clang, add 10.8 GB for tests)">
+  <!ENTITY llvm-time          "29 SBU (with Clang and parallelism=4, add 10 SBU for tests)">
 
   <!ENTITY clang-download-http "http://llvm.org/releases/&llvm-version;/cfe-&llvm-version;.src.tar.xz">
-  <!ENTITY clang-md5sum        "121b3896cb0c7765d690acc5d9495d24">
-  <!ENTITY clang-size          "12 MB">
+  <!ENTITY clang-md5sum        "4e419bd4e3b55aa06d872320f754bd85">
+  <!ENTITY clang-size          "11.3 MB">
 
   <!ENTITY rt-version                "&llvm-version;">
   <!ENTITY compiler-rt-download-http "http://llvm.org/releases/&rt-version;/compiler-rt-&rt-version;.src.tar.xz">
-  <!ENTITY compiler-rt-md5sum        "ba6368e894b5528e527d86a69d8533c6">
+  <!ENTITY compiler-rt-md5sum        "99bf8bcb68ba96dda74f6aee6c55f639">
   <!ENTITY compiler-rt-size          "1.6 MB">
 ]>
@@ -201,23 +201,10 @@
       -DLLVM_LINK_LLVM_DYLIB=ON             \
       -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \
-      -Wno-dev ..                           &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <application>Sphinx</application> and wish
-      to generate the html documentation and manual pages, issue the
-      following commands:
-    </para>
-<screen><userinput>cmake -DLLVM_ENABLE_SPHINX=ON         \
-      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
-      -Wno-dev ..                     &amp;&amp;
-make docs-llvm-html  docs-llvm-man</userinput></screen>
-    <para>
-      If you have downloaded the optional packages, the clang documentation
-      can be built too:
-    </para>
-<screen><userinput>make docs-clang-html docs-clang-man</userinput></screen>
-    <para>
-      To test the results, issue: <command>make check-all</command>. Tests are
+      -DLLVM_BUILD_TESTS=ON                 \
+      -Wno-dev -G Ninja ..                           &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja check-all</command>. Tests are
       built with a single thread, but run using the maximum number of 
       processors/threads available.
@@ -230,10 +217,26 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built  the documentation, install it by running the
-      following command as the <systemitem class="username">root</systemitem>
-      user:
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+    <para>
+      If you have installed <application>Sphinx</application> and wish
+      to generate the html documentation and manual pages, double check 
+      that you are still in the <filename class="directory">build</filename>
+      directory and issue the following commands:
+    </para>
+<screen><userinput>rm -rf ./*
+cmake -DLLVM_ENABLE_SPHINX=ON         \
+      -DSPHINX_WARNINGS_AS_ERRORS=OFF \
+      -Wno-dev ..                     &amp;&amp;
+make docs-llvm-html  docs-llvm-man</userinput></screen>
+    <para>
+      If you have downloaded the optional packages, the clang documentation
+      can be built too:
+    </para>
+<screen><userinput>make docs-clang-html docs-clang-man</userinput></screen>
+
+    <para>
+      Install the llvm documentation by running the following command as the 
+      <systemitem class="username">root</systemitem> user:
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 796bc6630a31c633833328155e5fc9a33b7d8544)
+++ introduction/welcome/changelog.xml	(revision 18a65e61f0c3c81458331cdddf13ad1aa2cb42e6)
@@ -42,4 +42,18 @@
     </listitem>
 -->
+    <listitem>
+      <para>August 16th, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to cmake-3.12.1. Fixes
+          <ulink url="&blfs-ticket-root;11001">#11001</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[thomas] - Update to llvm-6.0.1. Fixes
+          <ulink url="&blfs-ticket-root;10897">#10897</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 17th, 2018</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 796bc6630a31c633833328155e5fc9a33b7d8544)
+++ packages.ent	(revision 18a65e61f0c3c81458331cdddf13ad1aa2cb42e6)
@@ -308,5 +308,5 @@
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.12">
-<!ENTITY cmake-minor-version          "0">
+<!ENTITY cmake-minor-version          "1">
 <!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
 <!--<!ENTITY cvs-version                  "1.11.23">-->
@@ -323,5 +323,5 @@
 <!ENTITY guile-version                "2.2.4">
 <!ENTITY librep-version               "0.92.7">
-<!ENTITY llvm-version                 "6.0.0">
+<!ENTITY llvm-version                 "6.0.1">
 <!ENTITY llvm-old-version             "3.9.1">
 <!ENTITY lua-version                  "5.3.5">
