Index: general/prog/cmake.xml
===================================================================
--- general/prog/cmake.xml	(revision a419afbfe526f50fd9b9a3bca037b3be0d0eeb8a)
+++ general/prog/cmake.xml	(revision e4b0ac2271398e393132ee4aeb63c24a6b72be91)
@@ -7,8 +7,8 @@
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "0922130d0e0c142a88e58c6e4fef4d7d">
-  <!ENTITY cmake-size          "7.3 MB">
-  <!ENTITY cmake-buildsize     "382 MB (add 389 MB for tests)">
-  <!ENTITY cmake-time          "1.3 SBU (add 3.4 SBU for tests, both using parallelism=4)">
+  <!ENTITY cmake-md5sum        "084b1c8b2efc1c1ba432dea37243c0ae">
+  <!ENTITY cmake-size          "7.4 MB">
+  <!ENTITY cmake-buildsize     "316 MB (add 363 MB for tests)">
+  <!ENTITY cmake-time          "1.9 SBU (add 2.5 SBU for tests, both using parallelism=4)">
 ]>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a419afbfe526f50fd9b9a3bca037b3be0d0eeb8a)
+++ introduction/welcome/changelog.xml	(revision e4b0ac2271398e393132ee4aeb63c24a6b72be91)
@@ -46,4 +46,12 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to chromium-62.0.3202.94. Fixes
+          <ulink url="&blfs-ticket-root;10036">#10036</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to cmake-3.9.6. Fixes
+          <ulink url="&blfs-ticket-root;10018">#10018</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to tracker-2.0.2.</para>
         </listitem>
Index: packages.ent
===================================================================
--- packages.ent	(revision a419afbfe526f50fd9b9a3bca037b3be0d0eeb8a)
+++ packages.ent	(revision e4b0ac2271398e393132ee4aeb63c24a6b72be91)
@@ -302,5 +302,5 @@
 <!ENTITY clisp-version                "2.49">
 <!ENTITY cmake-major-version          "3.9">
-<!ENTITY cmake-minor-version          "5">
+<!ENTITY cmake-minor-version          "6">
 <!ENTITY cmake-version                "&cmake-major-version;.&cmake-minor-version;">
 <!--<!ENTITY cvs-version                  "1.11.23">-->
@@ -719,5 +719,5 @@
 
 <!-- Chapter 43 -->
-<!ENTITY chromium-version             "62.0.3202.89">
+<!ENTITY chromium-version             "62.0.3202.94">
 <!ENTITY epiphany-version             "3.26.1">
 <!ENTITY firefox-version              "57.0">
Index: xsoft/graphweb/chromium.xml
===================================================================
--- xsoft/graphweb/chromium.xml	(revision a419afbfe526f50fd9b9a3bca037b3be0d0eeb8a)
+++ xsoft/graphweb/chromium.xml	(revision e4b0ac2271398e393132ee4aeb63c24a6b72be91)
@@ -7,7 +7,7 @@
   <!ENTITY chromium-download-http "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-&chromium-version;.tar.xz">
   <!ENTITY chromium-download-ftp  " ">
-  <!ENTITY chromium-md5sum        "7c00d61cd737a2d81f2b8ca9efb44d6a">
+  <!ENTITY chromium-md5sum        "98cf7b6eca255e2422f96094eccc1887">
   <!ENTITY chromium-size          "493 MB">
-  <!ENTITY chromium-buildsize     "5.2 GB">
+  <!ENTITY chromium-buildsize     "5.7 GB">
   <!ENTITY chromium-time          "110 SBU (with parallelism=4)">
   <!-- Ninja defaults to parallel build unless supplying -j1, SBU measured on
@@ -158,9 +158,9 @@
     <para role="optional">
       <xref linkend="GConf"/>,
-      <xref linkend="icu"/>,
+      <xref linkend="icu"/> (currently broken),
       <xref linkend="gnome-keyring"/>,
-      <xref linkend="libevent"/> (currently broken),
+      <xref linkend="libevent"/>,
       <xref linkend="libvpx"/> (currently broken),
-      <xref linkend="libxml2"/> (currently broken),
+      <xref linkend="libxml2"/>,
       <xref linkend="upower"/> (runtime),
       <ulink url="https://devel.freebsoft.org/speechd">speech-dispatcher</ulink>
@@ -210,8 +210,9 @@
         Chromium uses many external projects, the selections below are not set
         in stone, however they have been tested thoroughly. With Chromium
-        &chromium-version;, system versions of libevent, libvpx, libxml2,
+        &chromium-version;, system versions of libvpx, libxml2,
         and zlib are known to break the build at this time.
         <!-- icu: Now at 59 internally - seems to work now -->
-        <!-- libevent: needs internal headers -->
+        <!-- icu: Now at 60 - is broken -->
+        <!-- libevent: needs internal headers - seems to work now -->
         <!-- libvpx: breaks build in gfx -->
         <!-- libxml2: breaks build with ui - seems to work now -->
@@ -228,5 +229,4 @@
         \! -path "*third_party/$LIB/google/*"    \
         \! -path "*base/third_party/icu/*"       \
-        \! -path "*base/third_party/libevent/*"  \
         \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
         -delete
@@ -234,6 +234,6 @@
 
 python build/linux/unbundle/replace_gn_files.py                   \
-    --system-libraries ffmpeg flac harfbuzz-ng libjpeg icu libxml<!-- libevent--> \
-                       libpng libwebp libxslt yasm freetype <!-- libxml libvpx-->      &amp;&amp;
+    --system-libraries ffmpeg flac harfbuzz-ng libjpeg libxml libevent \
+                       libpng libwebp libxslt opus yasm freetype <!-- libxml libvpx-->      &amp;&amp;
 python third_party/libaddressinput/chromium/tools/update-strings.py</userinput></screen>
 
@@ -317,15 +317,21 @@
 <screen role="root"><userinput>install -vDm755  out/Release/chrome \
                  /usr/lib/chromium/chromium                   &amp;&amp;
+
 install -vDm4755 out/Release/chrome_sandbox \
                  /usr/lib/chromium/chrome-sandbox             &amp;&amp;
+
 install -vDm755  out/Release/chromedriver \
                  /usr/lib/chromium/chromedriver               &amp;&amp;
-ln -svf /usr/lib/chromium/chromium /usr/bin                   &amp;&amp;
-ln -svf /usr/lib/chromium/chromedriver /usr/bin/              &amp;&amp;
-
-install -vm644  out/Release/icudtl.dat /usr/lib/chromium/     &amp;&amp;
+
+ln -svf /usr/lib/chromium/chromium     /usr/bin               &amp;&amp;
+ln -svf /usr/lib/chromium/chromedriver /usr/bin               &amp;&amp;
+
 install -vDm644 out/Release/gen/content/content_resources.pak \
                 /usr/lib/chromium/                            &amp;&amp;
-install -vm644  out/Release/{*.pak,*.bin} \
+<!-- This is needed if using internal icu -->
+install -vDm644 out/Release/icudtl.dat \
+                /usr/lib/chromium/icudtl.dat                  &amp;&amp;
+
+install -vDm644  out/Release/{*.pak,*.bin} \
                 /usr/lib/chromium/                            &amp;&amp;
 
