Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1d5aab8393a3e5fa36246488ed32c1dc902b568a)
+++ introduction/welcome/changelog.xml	(revision e67830f1d9d47bd8b2fcbe962568c657f8e37e8b)
@@ -48,4 +48,9 @@
       <para>June 15th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Firefox-38.0.5, SeaMonkey-2.33.1 and
+          Thunderbird-38.0.1 fixes to build with FreeType-2.6.  Fixes
+          <ulink url="&blfs-ticket-root;6611">#6611</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to fontforge-20150612.  Fixes
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 1d5aab8393a3e5fa36246488ed32c1dc902b568a)
+++ xsoft/graphweb/firefox.xml	(revision e67830f1d9d47bd8b2fcbe962568c657f8e37e8b)
@@ -234,17 +234,9 @@
 EOF</userinput></screen>
 
-    <!-- this problem seems to have gone with 36.0
-    <note><para>
-      There is a problem on i686 systems when building
-      <application>Firefox</application> with <application>gcc</application>
-      versions ranging from 4.8 to 4.9.1 and using the switch
-      <quote>\-\-enable-optimize</quote>. There are two alternatives. The best
-      one is to upgrade <application>gcc</application> to version 4.9.2 or later
-      because it will give better perfomance and smaller binaries.  However, if
-      you do not wish to upgrade gcc, reduce the level of optimization with:
-    </para>
-
-<screen><userinput>test $(uname -m) = "i686" &amp;&amp; sed -i 's/enable-optimize/&amp;=-O2/' mozconfig || true</userinput></screen>
-    </note>-->
+    <para>
+      First, fix building with system freetype-2.6 or later:
+    </para>
+
+<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' config/system-headers</userinput></screen>
 
     <para>
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision 1d5aab8393a3e5fa36246488ed32c1dc902b568a)
+++ xsoft/graphweb/seamonkey.xml	(revision e67830f1d9d47bd8b2fcbe962568c657f8e37e8b)
@@ -242,16 +242,9 @@
 EOF</userinput></screen>
 
-    <note><para>
-      There is a problem on i686 systems when building
-      <application>SeaMonkey</application> with <application>gcc</application>
-      versions ranging from 4.8 to 4.9.1 and using the switch
-      <quote>--enable-optimize</quote>. There are two alternatives. The best
-      one is to upgrade <application>gcc</application> to version 4.9.2 or later
-      because it will give better perfomance and smaller binaries.  However, if
-      you do not wish to upgrade gcc, reduce the level of optimization with:
-    </para>
-
-<screen><userinput>test $(uname -m) = "i686" &amp;&amp; sed -i 's/enable-optimize/&amp;=-O2/' mozconfig || true</userinput></screen>
-    </note>
+    <para>
+      First, fix building with system freetype-2.6 or later:
+    </para>
+
+<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers</userinput></screen>
 
     <note><para>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 1d5aab8393a3e5fa36246488ed32c1dc902b568a)
+++ xsoft/other/thunderbird.xml	(revision e67830f1d9d47bd8b2fcbe962568c657f8e37e8b)
@@ -243,18 +243,14 @@
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-# Build broken with system freetype-2.6
-ac_add_options --enable-tree-freetype</literal>
+ac_add_options --with-system-zlib</literal>
 EOF</userinput></screen>
-<!--
-    <para>
-      First, a bug needs to be fixed. Notice that thunderbuild needs to match
-      the value used in mozconfig (above) for the object directory (MOZ_OBJDIR):
-    </para>
-
-<!-\- might be necessary
-test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-\->
-<screen><userinput>mkdir -vp mozilla/thunderbuild</userinput></screen>-->
+
+    <para>
+      First, fix building with system freetype-2.6 or later:
+    </para>
+
+<!-- might be necessary
+test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
+<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers</userinput></screen>
 
     <para>
