diff --git a/general.ent b/general.ent
index 23b3be3c28..adde756328 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-<!ENTITY day          "25">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -518,7 +518,7 @@
 <!-- Chapter 37 -->
 <!ENTITY thunderbird-version          "1.5.0.2">
 <!ENTITY pan-version                  "0.14.2">
-<!ENTITY balsa-version                "2.3.6">
+<!ENTITY balsa-version                "2.3.12">
 <!ENTITY gaim-version                 "1.5.0">
 
 <!-- Part XI -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 654f0428a5..e9274dbecf 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,13 +41,22 @@
 
 -->
 
+    <listitem>
+      <para>April 26th, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to Balsa-2.3.12.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>April 25th, 2006</para>
       <itemizedlist>
         <listitem>
           <para>[dnicholson] - Fixes for Cyrus SASL-2.1.21. Added patch to
-          allow OpenLDAP => 2.3, converted GCC-4 patch to an sed, and added
-          an sed command to put saslauthd man page in the correct location.
+          allow OpenLDAP => 2.3, converted GCC-4 patch to a sed, and added
+          a sed command to put saslauthd man page in the correct location.
           Noted method to address LDAPDB plugin circular dependency in the
           User Notes.</para>
         </listitem>
diff --git a/xsoft/other/balsa.xml b/xsoft/other/balsa.xml
index a297245b5a..86461e55fe 100644
--- a/xsoft/other/balsa.xml
+++ b/xsoft/other/balsa.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY balsa-download-http "http://balsa.gnome.org/balsa-&balsa-version;.tar.bz2">
   <!ENTITY balsa-download-ftp  " ">
-  <!ENTITY balsa-md5sum        "c357968588edc753ca51d397dbc2a9d3">
-  <!ENTITY balsa-size          "3.1 MB">
-  <!ENTITY balsa-buildsize     "52.6 MB">
+  <!ENTITY balsa-md5sum        "3792d22cde7aceeae37108ed09477711">
+  <!ENTITY balsa-size          "2.4 MB">
+  <!ENTITY balsa-buildsize     "52.2 MB">
   <!ENTITY balsa-time          "0.7 SBU">
 ]>
 
@@ -64,15 +64,19 @@
     <para role="required"><xref linkend="libgnomeui"/>,
     <xref linkend="libgnomeprintui"/>,
     <xref linkend="scrollkeeper"/>,
-    <xref linkend="aspell"/> and
+    <xref linkend="aspell"/>, and
     <xref linkend="gmime"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libgtkhtml"/>,
+    <xref linkend="gtksourceview"/>,
     <xref linkend="libesmtp"/>,
     <xref linkend="openssl"/>,
     <xref linkend="openldap"/>,
     <xref linkend="pcre"/>,
+    <xref linkend="compface"/>,
+    <ulink url="http://gtkspell.sourceforge.net/">GtkSpell</ulink> (provides
+    on-the-fly as you type spell checking),
     <xref linkend="sendmail"/> (or other
     <ulink url="../server/mail.html">MTA</ulink> that links to
     <command>/usr/sbin/sendmail</command>),
@@ -82,8 +86,8 @@
     <bridgehead renderas="sect4">Optional to Build Experimental S/MIME Support</bridgehead>
     <para role="optional"><ulink
     url="http://www.gnupg.org/download/index.html#libksba">Libksba</ulink>,
-    <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME</ulink> and
-    <ulink url="http://www.gnupg.org/download/index.html#gnupg2">GnuPG-1.9.x</ulink></para>
+    <ulink url="http://www.gnupg.org/download/index.html#gnupg2">GnuPG-1.9.x</ulink>, and
+    <ulink url="http://www.gnupg.org/download/index.html#gpgme">GPGME</ulink></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/balsa"/></para>
@@ -96,9 +100,11 @@
     <para>Install <application>Balsa</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
-    --localstatedir=/var/lib --sysconfdir=&gnome-etc-dir; \
-    --with-gtkhtml=no --with-esmtp=no &amp;&amp;
+<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
+            --localstatedir=/var/lib \
+            --sysconfdir=&gnome-etc-dir; \
+            --with-gtkhtml=no \
+            --with-esmtp=no &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -179,8 +185,8 @@ make</userinput></screen>
       <seglistitem>
         <seg>balsa and balsa-ab</seg>
         <seg>None</seg>
-        <seg>$GNOME_PREFIX/share/balsa, $GNOME_PREFIX/share/sounds/balsa and
-        $GNOME_PREFIX/share/gnome/help/balsa</seg>
+        <seg>The following subdirectories of $GNOME_PREFIX/share/:
+        {gnome/help, omf, sounds}/balsa</seg>
       </seglistitem>
     </segmentedlist>