diff --git a/general.ent b/general.ent
index 7369129e63..50166cb5dd 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "28">                   <!-- Always 2 digits -->
+<!ENTITY day          "30">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 28th &year;">
+<!ENTITY releasedate  "June 30th &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 84992e7af7..e2bfb386e7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,21 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>June 30th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Complete fix for Thunderbird with GCC-6.1. Fixes
+          <ulink url="&blfs-ticket-root;8006">#8006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Use internal copy of SQLite for Thunderbird and remove
+          -DSQLITE_ENABLE_FTS3_TOKENIZER=1 from SQLite instructions to avoid
+           potential security vulnerability.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 28th, 2016</para>
       <itemizedlist>
@@ -138,8 +153,8 @@
       <para>June 26th, 2016</para>
       <itemizedlist>
         <listitem>
-          <para>[dj] - Added build-fix for Thunderbird-45.1.1 with GCC-6.1.
-          Fixes <ulink url="&blfs-ticket-root;8006">#8006</ulink>.</para>
+          <para>[dj] - Added build-fix for Thunderbird-45.1.1 with
+          GCC-6.1.</para>
         </listitem>
         <listitem>
           <para>[renodr] - Update to vala-0.32.1. Fixes
diff --git a/server/databases/sqlite.xml b/server/databases/sqlite.xml
index aa5be407c0..185bfc41ef 100644
--- a/server/databases/sqlite.xml
+++ b/server/databases/sqlite.xml
@@ -128,7 +128,6 @@
 
 <screen><userinput>./configure --prefix=/usr --disable-static        \
             CFLAGS="-g -O2 -DSQLITE_ENABLE_FTS3=1 \
-            -DSQLITE_ENABLE_FTS3_TOKENIZER=1      \
             -DSQLITE_ENABLE_COLUMN_METADATA=1     \
             -DSQLITE_ENABLE_UNLOCK_NOTIFY=1       \
             -DSQLITE_SECURE_DELETE=1              \
diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml
index 2c50841e67..64cc6c0431 100644
--- a/xsoft/other/thunderbird.xml
+++ b/xsoft/other/thunderbird.xml
@@ -77,7 +77,7 @@
       <listitem>
         <para>
           Required patch, if building with gcc-6:
-          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-gcc6-1.patch"/>
+          <ulink url="&patch-root;/thunderbird-&thunderbird-version;-gcc6-2.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -97,9 +97,11 @@
     <para role="recommended">
       <xref linkend="libevent"/>,
       <xref linkend="libvpx"/>,
-      <xref linkend="nspr"/>,
-      <xref linkend="nss"/>, and
+      <xref linkend="nspr"/>, and
+      <xref linkend="nss"/><!-- , and
       <xref linkend="sqlite"/>
+      Do not use system SQLite until TB-48/52 because it uses insecure 
+      routines (FTS3) that are not built in BLFS -->
     </para>
 
     <note>
@@ -141,6 +143,7 @@
       <xref linkend="gst10-libav"/> at runtime),
       <xref linkend="openjdk"/>,
       <xref linkend="pulseaudio"/>,
+      <xref linkend="sqlite"/> (not recommended),
       <xref linkend="startup-notification"/>,
       <xref linkend="wget"/>,
       <xref linkend="wireless_tools"/>, and
@@ -203,7 +206,8 @@ ac_add_options --disable-gconf
 
 # Comment out following options if you have not installed
 # recommended dependencies:
-ac_add_options --enable-system-sqlite
+# Do not use system SQLite for Thunderbird 45.x
+#ac_add_options --enable-system-sqlite
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
@@ -247,7 +251,7 @@ EOF</userinput></screen>
 test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
     <para>Fix some issues with GCC-6.1:</para>
 
-<screen><userinput>patch -Np1 -i ../thunderbird-&thunderbird-version;-gcc6-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../thunderbird-&thunderbird-version;-gcc6-2.patch</userinput></screen>
 
     <para>
       Compile <application>Thunderbird</application> by issuing the following
@@ -261,6 +265,7 @@ test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozcon
 
 <screen><userinput>CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+export CFLAGS CXXFLAGS
 make -f client.mk</userinput></screen>
 
     <para>