diff --git a/general.ent b/general.ent
index f338357b94..e7ace50cda 100644
--- a/general.ent
+++ b/general.ent
@@ -1,4 +1,4 @@
-<!ENTITY day          "25">
+<!ENTITY day          "26">
 <!ENTITY month        "08">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 9df30666fa..8dac47a2d5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,20 @@
 
 -->
 
+    <listitem>
+      <para>August 26th, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Added fixes to the Thunderbird instructions: 1) 
+          the Movemail and RSS &amp; Blogs account setup options are now
+          available 2) modified the Enigmail setup so that it actually works
+          3) fixed the profile locking problem 4) made it so that if a mailto:
+          URL is clicked, a message compose window is opened with the To: field
+          filled out.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>August 25th, 2005</para>
       <itemizedlist>
diff --git a/xsoft/other/thunderbird.xml b/xsoft/other/thunderbird.xml
index e56d26cfd5..b432b0ce26 100644
--- a/xsoft/other/thunderbird.xml
+++ b/xsoft/other/thunderbird.xml
@@ -20,6 +20,18 @@
   <!ENTITY thunderbird-ipc-md5sum        "64ba4c6e3b52568468c4f6680ec7e679">
 ]>
 
+<!--
+
+Devs:
+
+Always check the mail/config/mozconfig file in the source tree for
+any changes to the options passed to configure. This file shows the
+default build used by Mozilla. BLFS adds to this, but the values here
+should be in our setup. The stuff about ActiveX can be ignored as 
+that is Windows crap only.
+
+-->
+
 <sect1 id="thunderbird" xreflabel="Thunderbird-&thunderbird-version;">
   <?dbhtml filename="thunderbird.html" ?>
 
@@ -64,6 +76,12 @@
     </itemizedlist>
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/thunderbird-&thunderbird-version;-fixes-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
 
     <para>To enable the <application>Enigmail</application> extension to the
     <application>Thunderbird</application> mail client, you'll need to download
@@ -94,8 +112,8 @@
     <xref linkend="libidl"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="gnupg"/> (for the <application>Enigmail</application>
-    extension)</para>
+    <para><xref linkend="gnupg"/> (run-time only dependency for the
+    <application>Enigmail</application> extension)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para><xref linkend="libjpeg"/>,
@@ -125,12 +143,10 @@
 <screen><userinput>export MOZILLA_OFFICIAL="1" &amp;&amp;
 export BUILD_OFFICIAL="1" &amp;&amp;
 export MOZ_THUNDERBIRD="1" &amp;&amp;
-
-sed -i -e 's/$(destdir)$(bindir)/$(DESTDIR)$(mozappdir)/' \
-       mail/app/Makefile.in &amp;&amp;
- 
+patch -Np1 -i ../thunderbird-&thunderbird-version;-fixes-1.patch &amp;&amp; 
 ./configure --prefix=/usr \
             --with-default-mozilla-five-home=/usr/lib/thunderbird-&thunderbird-version; \
+            --with-user-appdir=.thunderbird \
             --with-system-zlib \
             --with-system-png \
             --enable-application=mail \
@@ -171,22 +187,30 @@ make</userinput></screen>
 tar -zxf ../ipc-&thunderbird-ipc-version;.tar.gz -C extensions &amp;&amp;
 build/autoconf/make-makefile extensions/ipc extensions/enigmail &amp;&amp;
 make -C extensions/ipc &amp;&amp;
-make -C extensions/enigmail</userinput></screen>
+make -C extensions/enigmail &amp;&amp;
+make -C extensions/enigmail xpi</userinput></screen>
 
     <para>Install <application>Thunderbird</application> by running the following
     commands as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -d /usr/include/thunderbird-&thunderbird-version;/nss &amp;&amp;
-cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
-    /usr/include/thunderbird-&thunderbird-version;/nss</userinput></screen>
+install -v -m755 -d /usr/include/thunderbird-&thunderbird-version;/nss &amp;&amp;
+cp -v -Lf dist/private/nss/*.h dist/public/nss/*.h \
+    /usr/include/thunderbird-&thunderbird-version;/nss &amp;&amp;
+install -v -m755 -d /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/US &amp;&amp;
+install -v -m644 mailnews/base/ispdata/movemail.rdf \
+                 mail/extensions/newsblog/rss.rdf \
+    /usr/lib/thunderbird-&thunderbird-version;/defaults/isp &amp;&amp;
+ln -v -s ../{movemail,rss}.rdf \
+    /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/US</userinput></screen>
 
     <para>If you're installing the <application>Enigmail</application> extension,
     issue the following commands as the <systemitem
     class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make -C extensions/ipc install &amp;&amp;
-make -C extensions/enigmail install</userinput></screen>
+<screen role="root"><userinput>install -v -m755 -d /usr/lib/thunderbird-&thunderbird-version;/extensions &amp;&amp;
+install -v -m644 dist/bin/enigmail-&thunderbird-enigmail-version;-linux-*.xpi \
+    /usr/lib/thunderbird-&thunderbird-version;/extensions</userinput></screen>
 
     <para>To enable multi-user operation, execute the following as the
     <systemitem class="username">root</systemitem> user:</para>
@@ -199,10 +223,11 @@ export MOZILLA_FIVE_HOME="$PWD" &amp;&amp;
 touch `find . -name *.rdf`</userinput></screen>
 
     <note>
-      <para>You should run <command>/usr/bin/thunderbird</command> once as
-      the <systemitem class="username">root</systemitem> user (or any user
-      with write privileges) to create some necessary additional files in
-      the <filename class='directory'>/usr</filename> hierarchy.</para>
+      <para>You should run <command>/usr/bin/thunderbird</command> once as the
+      <systemitem class="username">root</systemitem> user (or any user with
+      write privileges) to create some necessary additional files in the
+      <filename class='directory'>/usr/lib/thunderbird-&thunderbird-version;</filename>
+      directory.</para>
     </note>
 
     <para>Finally, unset the build variables from the unprivileged user's
@@ -217,9 +242,41 @@ unset MOZ_THUNDERBIRD</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i -e 's/$(destdir)$(bindir)/$(DESTDIR)$(mozappdir)/'
-    mail/app/Makefile.in</command>: Correct the installation location of the
-    <filename class='directory'>defaults</filename> directory.</para>
+    <para><command>patch -Np1 -i ...</command>: This patches fixes three major
+    issues with the <application>Thunderbird</application> installation. First,
+    it moves the installation of the <filename>prefs.js</filename> file from
+    <filename class='directory'>/usr/bin/defaults/profile</filename> to
+    <filename class='directory'>/usr/lib/thunderbird-&thunderbird-version;/defaults/profile</filename>,
+    it fixes a profile locking problem if the <command>thunderbird</command>
+    script is called when <application>Thunderbird</application> is already
+    running and last, makes it so that if a
+    <computeroutput>mailto:</computeroutput> URL is clicked, a message
+    compose window will open with the <computeroutput>To:</computeroutput>
+    field filled out.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Thunderbird</title>
+
+    <sect3><title>Configuration Information</title>
+
+      <para>Configuration of <application>Thunderbird</application> to use the
+      <application>Enigmail</application> extension must be done on an
+      as-needed basis for each user of the system who may use
+      <application>Thunderbird</application>. It is accomplished through the
+      <application>Thunderbird</application> <quote>Tools</quote> menu. Choose
+      the <quote>Extensions</quote> &ndash; <quote>Install</quote> option and
+      fill in the <quote>Look in:</quote> field with
+      <filename class='directory'>/usr/lib/thunderbird-&thunderbird-version;/extensions</filename>.
+      You'll then see the
+      <filename>enigmail-&thunderbird-enigmail-version;-linux-????.xpi</filename>
+      file listed. Choose this file and click on <quote>Open</quote>, then 
+      click on <quote>Install now</quote>. The
+      <application>Enigmail</application> extension will install and you will
+      be prompted to restart <application>Thunderbird</application>.</para>
+
+    </sect3>
 
   </sect2>
 
@@ -227,7 +284,7 @@ unset MOZ_THUNDERBIRD</userinput></screen>
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>