Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
+++ introduction/welcome/changelog.xml	(revision e399c12f5189830f3c5194fd6c64ec810106ae6b)
@@ -42,6 +42,19 @@
     </listitem>
     -->
-    <!-- The next person that does a commit that applies to both revisions
-    of the book needs to correct this -->
+    <listitem>
+      <para>May 21st, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Firefox-67.0 (includes security fixes). Use gcc in
+          preference to LLVM, disable debug symbols, and stop using the gold
+          linker. The result is a much smaller build. Please note that both nasm
+          and yasm are now used. Fixes <ulink
+          url="&blfs-ticket-root;12082">#12082</ulink>. Please be aware that you
+          may need to create a new profile when running this version, and
+          reapply your customizations, extensions, and perhaps bookmarks.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
       <para>May 20th, 2019</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
+++ packages.ent	(revision e399c12f5189830f3c5194fd6c64ec810106ae6b)
@@ -867,5 +867,5 @@
 <!ENTITY epiphany-version             "3.30.3">
 <!ENTITY falkon-version               "3.0.1">
-<!ENTITY firefox-version              "66.0.5">
+<!ENTITY firefox-version              "67.0">
 <!ENTITY flashplayer-version          "27.0.0.187">
 <!ENTITY qupzilla-version             "2.2.6">
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 77deb22e0ea84e23c36b0e39339228bcd318d26b)
+++ xsoft/graphweb/firefox.xml	(revision e399c12f5189830f3c5194fd6c64ec810106ae6b)
@@ -7,13 +7,13 @@
   <!ENTITY firefox-download-http "&mozilla-http;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.xz">
   <!ENTITY firefox-download-ftp  " ">
-  <!ENTITY firefox-md5sum        "a3d00fb4e950558135f08a5155745d4e">
-  <!ENTITY firefox-size          "269 MB">
+  <!ENTITY firefox-md5sum        "41a5d504deaed12ebf0e25bb1420f08">
+  <!ENTITY firefox-size          "270 MB">
   <!-- NB with stylo, much of the build uses rust, and therefore cargo files.
     But the extra cached cargo files, if any, seem to be minimal -->
-  <!ENTITY firefox-buildsize     "11.8 GB (156 MB installed) without tests">
+  <!ENTITY firefox-buildsize     "3.8 GB (154 MB installed) without tests">
   <!-- editors: with ff63 and rust-1.29, ./mach build -j4 is probably the
    most practical way to get a timing on a machine with more cores, if taking
    cores offline is not practical. If in doubt, round up -->
-  <!ENTITY firefox-time          "25 SBU (with parallelism=4) without tests">
+  <!ENTITY firefox-time          "28 SBU (with parallelism=4) without tests">
 ]>
 
@@ -139,5 +139,4 @@
       <xref linkend="autoconf213"/>,
       <xref linkend="cbindgen"/>,
-      <application>Clang</application> (from <xref linkend="llvm"/>),
       both <xref linkend="gtk3"/> and
       <xref linkend="gtk2"/>,
@@ -162,5 +161,6 @@
 <!-- fails to build in 65.0 (headers changed)
       <xref linkend="libvpx"/>, -->
-      <xref linkend="libwebp"/>, and
+      <xref linkend="libwebp"/>,
+      <xref linkend="nasm"/>, and
       <xref linkend="sqlite"/>
     </para>
@@ -257,13 +257,10 @@
 ac_add_options --with-system-icu
 
-# The gold linker is no-longer the default
-ac_add_options --enable-linker=gold
-
-# The shipped libdavid (av1 decoder) is not built by default,
-# at least on linux, but if nasm is not present libxul tries to
-# link to one of libdavid's objects and fails.  It is thought
-# libdavid will be enabled in firefox-67, at which point nasm
-# might be required.
-ac_add_options --disable-av1
+# Do not specify the gold linker which is not the default. It will take
+# longer and use more disk space when debug symbols are disabled.
+
+# libdavid (av1 decoder) requires nasm. Uncomment this if nasm
+# has not been installed.
+#ac_add_options --disable-av1
 
 # You cannot distribute the binary if you do this
@@ -279,4 +276,8 @@
 #ac_add_options --disable-strip
 #ac_add_options --disable-install-strip
+
+# Disabling debug symbols makes the build much smaller and a little
+# faster. Comment this if you need to run a debugger.
+ac_add_options --disable-debug-symbols
 
 # The BLFS editors recommend not changing anything below this line:
@@ -290,6 +291,5 @@
 ac_add_options --disable-tests
 
-# With clang, unlike gcc-7 and later, the default level
-# of optimization produces a working build.
+# The default level of optimization again produces a working build with gcc.
 ac_add_options --enable-optimize
 
@@ -362,13 +362,16 @@
 
     <para>
-<!--  Invoke the Python script to compile the package: -->
-      To use the system version of ICU, run a sed to avoid a conflict between
+      If you are still using ICU-63, run a sed to avoid a conflict between
       upstream ICU's use of <literal>CheckImpl()</literal> in their public headers
       and firefox's internal use of a different <literal>CheckImpl()</literal>.
-      Then invoke the Python2 script to compile the package.
-    </para>
-
-<screen><userinput>sed -e 's/checkImpl/checkFFImpl/g' -i js/src/vm/JSContext*.h &amp;&amp;
-export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib &amp;&amp;
+    </para>
+
+<screen role="nodump"><userinput>sed -e 's/checkImpl/checkFFImpl/g' -i js/src/vm/JSContext*.h</userinput></screen>
+
+    <para>
+      Invoke the Python2 script to compile the package.
+    </para>
+
+<screen><userinput>export CC=gcc CXX=g++ &amp;&amp;
 export MOZBUILD_STATE_PATH=${PWD}/mozbuild &amp;&amp;
 ./mach build</userinput></screen>
@@ -398,5 +401,5 @@
     </para>
 
-<screen><userinput>unset CC CXX AR NM RANLIB MOZBUILD_STATE_PATH</userinput></screen>
+<screen><userinput>unset CC CXX MOZBUILD_STATE_PATH</userinput></screen>
 
   </sect2>
@@ -407,16 +410,15 @@
     <para>
       <command>sed -e 's/checkImpl/checkFFImpl/g' ...</command>: Although the
-      package ships with a modified version of <application>ICU-59</application>
-      and only tests that the system version, if requested, is at least 59,
-      changes in <emphasis>some</emphasis> versions cause builds with the system
-      version to fail with error messages of the form <literal>no void
-      JSContext::checkImpl_NN member function</literal> where NN is the system
-      <application>ICU</application> version. The sed renames the local function.
-    </para>
-
-    <para>
-      <command>export CC=clang CXX=clang++ ...</command>: Upstream now use
-      <application>clang</application> and building with any recent version
-      saves a lot of space.
+      package ships with a modified version of <application>ICU-63</application>
+      and only tests that the system version, if used, is at least 63, changes
+      from upstream 63 cause builds with the system version to fail with an error
+      message <literal>no void JSContext::checkImpl_63 member function</literal>.
+      The sed renames the local function. Upstream ICU-64 works around this.
+    </para>
+
+    <para>
+      <command>export CC=gcc CXX=g++ ...</command>: Upstream now prefer
+      <application>clang</application>, but gcc is a more secure compiler and
+      now produces reasonably-sized builds.
     </para>
 
@@ -454,5 +456,5 @@
       of cores, e.g. -j4 for 4 cores: First, if using all the cores causes
       the build to swap because you have insufficient memory (e.g. for 4 cores
-      a build without system graphite2 and harfbuzz now uses slightly over 8GB
+      a build without system graphite2 and harfbuzz now uses towards 8GB
       of RAM). In such cases, using fewer cores can be faster. Second, on some
       machines the middle part of the build can drag on as if only one core is
@@ -474,4 +476,10 @@
       class="directory">/usr/lib/mozilla/plugins</filename> by default, but the
       symbolic link is made to keep all the plugins installed in one folder.
+    </para>
+
+    <para>
+      <option>export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib</option>:
+      Use this as an alternative to building with gcc and g++ if you wish to use
+      the clang toolchain. Remember to unset these variables after the build.
     </para>
 
