diff --git a/general.ent b/general.ent
index 1d2fa6d95a..602fea7772 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 2nd &year;">
+<!ENTITY releasedate  "July 3rd &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 bd52066d20..4234654c31 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,12 +43,21 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>July 3rd, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Added firefox-47.0.1-gcc6-1.patch. Fixes
+          <ulink url="&blfs-ticket-root;8015">#8015</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>July 2nd, 2016</para>
       <itemizedlist>
         <listitem>
-          <para>[dj] - Update to Firefox-47.0.1. Fixes
-          <ulink url="&blfs-ticket-root;8015">#8015</ulink>.</para>
+          <para>[dj] - Update to Firefox-47.0.1.</para>
         </listitem>
         <listitem>
           <para>[dj] - Update to Thunderbird-45.2.0. Fixes
diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml
index a1235a170f..58533f2349 100644
--- a/xsoft/graphweb/firefox.xml
+++ b/xsoft/graphweb/firefox.xml
@@ -72,6 +72,12 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch if using gcc-6 or later
+          <ulink url="&patch-root;/firefox-&firefox-version;-gcc6-1.patch"/>
+        </para>
+      </listitem>
       <listitem>
         <para>
           Required patch if using gtk+-3.20 or later (do not use with earlier versions)
@@ -275,6 +281,12 @@ EOF</userinput></screen>
       commands:
     </para>
 
+    <para>
+      Fix an issue with GCC-6.0 and higher:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-gcc6-1.patch</userinput></screen>
+
     <para>
       If you are using gtk+-3.20 or later, apply a patch to restore the
       slider on scrollbars:
@@ -297,16 +309,10 @@ EOF</userinput></screen>
       <envar>SHELL=/bin/sh</envar>.
     </para></note>
 
-<screen><userinput>sed -e '/#include/i\
-    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-    -i nsprpub/config/make-system-wrappers.pl
-
-sed -e '/#include/a\
-    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-    -i nsprpub/config/make-system-wrappers.pl
-
-CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+<screen><userinput>export CFLAGS_HOLD=$CFLAGS &amp;&amp;
+export CXXFLAGS_HOLD=$CXXFLAGS &amp;&amp;
+export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" &amp;&amp;
+export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" &amp;&amp;
 
 make -f client.mk</userinput></screen>
 
@@ -322,7 +328,11 @@ make -f client.mk</userinput></screen>
 chown -R 0:0 /usr/lib/firefox-&firefox-version;   &amp;&amp;
 
 mkdir -pv    /usr/lib/mozilla/plugins  &amp;&amp;
-ln    -sfv   ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
+ln    -sfv   ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser &amp;&amp;
+
+export CFLAGS=$CFLAGS_HOLD &amp;&amp;
+export CXXFLAGS=$CXXFLAGS_HOLD &amp;&amp;
+unset CFLAGS_HOLD CXXFLAGS_HOLD</userinput></screen>
 
   </sect2>