Index: general.ent
===================================================================
--- general.ent	(revision e48056fd9568ea93358a379c7292825d6168bdc1)
+++ general.ent	(revision 1f84fb4c44858554be861b36baa49c9f2521db38)
@@ -1,5 +1,5 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "29">                   <!-- Always 2 digits -->
+<!ENTITY day          "30">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7,5 +7,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 29th &year;">
+<!ENTITY releasedate  "September 30th &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e48056fd9568ea93358a379c7292825d6168bdc1)
+++ introduction/welcome/changelog.xml	(revision 1f84fb4c44858554be861b36baa49c9f2521db38)
@@ -44,4 +44,18 @@
 
 -->
+
+    <listitem>
+      <para>September 30th, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to wpa_supplicant-2.5. Fixes
+          <ulink url="&blfs-ticket-root;6983">#6983</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to thunderbird-38.3.0. Fixes
+          <ulink url="&blfs-ticket-root;6985">#6985</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision e48056fd9568ea93358a379c7292825d6168bdc1)
+++ networking/netprogs/wpa_supplicant.xml	(revision 1f84fb4c44858554be861b36baa49c9f2521db38)
@@ -8,8 +8,8 @@
            "http://hostap.epitest.fi/releases/wpa_supplicant-&wpa_supplicant-version;.tar.gz">
   <!ENTITY wpa_supplicant-download-ftp  " ">
-  <!ENTITY wpa_supplicant-md5sum        "f0037dbe03897dcaf2ad2722e659095d">
-  <!ENTITY wpa_supplicant-size          "2.4 MB">
-  <!ENTITY wpa_supplicant-buildsize     "28 MB">
-  <!ENTITY wpa_supplicant-time          "0.2 SBU">
+  <!ENTITY wpa_supplicant-md5sum        "96ff75c3a514f1f324560a2376f13110">
+  <!ENTITY wpa_supplicant-size          "2.5 MB">
+  <!ENTITY wpa_supplicant-buildsize     "31 MB">
+  <!ENTITY wpa_supplicant-time          "0.4 SBU (includes optional gui)">
 ]>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision e48056fd9568ea93358a379c7292825d6168bdc1)
+++ packages.ent	(revision 1f84fb4c44858554be861b36baa49c9f2521db38)
@@ -360,5 +360,5 @@
 <!ENTITY wget-version                 "1.16.3">
 <!ENTITY wireless-tools-version       "29">
-<!ENTITY wpa_supplicant-version       "2.4">
+<!ENTITY wpa_supplicant-version       "2.5">
 
 <!-- Chapter 16 -->
@@ -649,5 +649,5 @@
 <!ENTITY rox-filer-version            "2.11">
 <!ENTITY rxvt-unicode-version         "9.21">
-<!ENTITY thunderbird-version          "38.2.0">
+<!ENTITY thunderbird-version          "38.3.0">
 <!ENTITY tigervnc-version             "1.5.0">
 <!ENTITY transmission-version         "2.84">
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision e48056fd9568ea93358a379c7292825d6168bdc1)
+++ xsoft/other/thunderbird.xml	(revision 1f84fb4c44858554be861b36baa49c9f2521db38)
@@ -8,8 +8,8 @@
 <!--  <!ENTITY thunderbird-download-ftp "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">-->
   <!ENTITY thunderbird-download-ftp " ">
-  <!ENTITY thunderbird-md5sum            "df97af48b670cdaa5196a90360c952f7">
+  <!ENTITY thunderbird-md5sum            "81dd8b5679787fd5fd91b76bc7923951">
   <!ENTITY thunderbird-size              "195 MB">
-  <!ENTITY thunderbird-buildsize         "3.9 GB (72 MB installed)">
-  <!ENTITY thunderbird-time              "8.6 SBU (with -j4, estimated 30 SBU with -j1)">
+  <!ENTITY thunderbird-buildsize         "4.7 GB (68 MB installed)">
+  <!ENTITY thunderbird-time              "6.5 SBU (with -j12, estimated 30 SBU with -j1)">
 ]>
 
@@ -230,5 +230,7 @@
 ac_add_options --enable-url-classifier
 
-ac_add_options --enable-system-cairo
+# Use internal cairo due to reports of unstable execution with
+# system cairo
+#ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
