Index: general/prog/gcc.xml
===================================================================
--- general/prog/gcc.xml	(revision e450d21fd582c7d15bedab51b420b9ae4f31fdf3)
+++ general/prog/gcc.xml	(revision c6bfee889a5f6d02af2849e55975f07ace3d2c8d)
@@ -127,4 +127,8 @@
     bootstrap anyways, add <parameter>--disable-bootstrap</parameter> to the
     <command>./configure</command> options below.</para>
+
+    <para>As in LFS, fix a problem identified upstream:</para>
+
+<screen><userinput>sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
 
     <para>Install <application>GCC</application> by running the
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision e450d21fd582c7d15bedab51b420b9ae4f31fdf3)
+++ introduction/welcome/changelog.xml	(revision c6bfee889a5f6d02af2849e55975f07ace3d2c8d)
@@ -48,4 +48,16 @@
       <para>August 6th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Exim-4.83: fix exim daemon version in
+          'Short Descriptions'. Thanks Denis M.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - GCC-4.9.1: as in LFS, use sed to fix a problem
+          identified upstream.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - FLTK-1.3.2: fix output of fltk-config --version.
+          Thanks Jeremy H.</para>
+        </listitem>
         <listitem>
           <para>[igor] - Update to libxcb-1.11. Fixes
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision e450d21fd582c7d15bedab51b420b9ae4f31fdf3)
+++ server/mail/exim.xml	(revision c6bfee889a5f6d02af2849e55975f07ace3d2c8d)
@@ -11,4 +11,8 @@
   <!ENTITY exim-buildsize       "17 MB">
   <!ENTITY exim-time            "0.2 SBU">
+
+
+
+  <!ENTITY exim-daemon-version  "&exim-version;-3">
 ]>
 
@@ -313,5 +317,5 @@
 
       <seglistitem>
-        <seg>exicyclog, exigrep, exim, exim-4.83-3, exim_checkaccess,
+        <seg>exicyclog, exigrep, exim, exim-&exim-daemon-version;, exim_checkaccess,
         exim_dbmbuild, exim_dumpdb, exim_fixdb, exim_lock, exim_tidydb,
         eximstats, exinext, exipick, exiqgrep, exiqsumm, exiwhat, and
@@ -350,5 +354,5 @@
         <term><command>exim</command></term>
         <listitem>
-          <para>is a symlink to the <command>exim-4.82_1-5b7a7c0-XX-3</command>
+          <para>is a symlink to the <command>exim-&exim-daemon-version;</command>
           MTA daemon.</para>
           <indexterm zone="exim exim-prog">
@@ -358,11 +362,11 @@
       </varlistentry>
 
-      <varlistentry id="exim-4.82_1-5b7a7c0-XX-3">
-        <term><command>exim-4.82_1-5b7a7c0-XX-3</command></term>
+      <varlistentry id="exim-&exim-daemon-version;">
+        <term><command>exim-&exim-daemon-version;</command></term>
         <listitem>
           <para>is the <application>Exim</application> mail transport
           agent daemon.</para>
-          <indexterm zone="exim exim-4.82_1-5b7a7c0-XX-3">
-            <primary sortas="b-exim-4.82_1-5b7a7c0-XX-3">exim-4.82_1-5b7a7c0-XX-3</primary>
+          <indexterm zone="exim exim-&exim-daemon-version;">
+            <primary sortas="b-exim-&exim-daemon-version;">exim-&exim-daemon-version;</primary>
           </indexterm>
         </listitem>
Index: x/installing/libvdpau-va-gl.xml
===================================================================
--- x/installing/libvdpau-va-gl.xml	(revision e450d21fd582c7d15bedab51b420b9ae4f31fdf3)
+++ x/installing/libvdpau-va-gl.xml	(revision c6bfee889a5f6d02af2849e55975f07ace3d2c8d)
@@ -178,5 +178,5 @@
         <listitem>
           <para>
-            contains functions to impement the OpenGL backend to 
+            contains functions to implement the OpenGL backend to 
             the VDPAU (Video Decode and Presentation API for Unix) API.
           </para>
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision e450d21fd582c7d15bedab51b420b9ae4f31fdf3)
+++ x/lib/fltk.xml	(revision c6bfee889a5f6d02af2849e55975f07ace3d2c8d)
@@ -132,4 +132,5 @@
 <screen><userinput>patch -Np1 -i ../fltk-&fltk-version;-tigervnc-1.patch     &amp;&amp;
 patch -Np1 -i ../fltk-&fltk-version;-dynamic_libs-1.patch &amp;&amp;
+sed -i -e '/FL_PATCH_VERSION=/ s/1/2/' configure &amp;&amp;
 sed -i -e '/cat./d' documentation/Makefile       &amp;&amp;
 
@@ -175,4 +176,9 @@
       <command>patch ...dynamic_libs-1.patch</command>: Allow building
       dynamic libraries.
+    </para>
+
+    <para>
+      <command>sed ... configure</command>: configure: Fix output of
+      <command>fltk-config --version</command>.
     </para>
 
