Index: general.ent
===================================================================
--- general.ent	(revision 841a93f86caa604701a2671f23fab43d3d5f4922)
+++ general.ent	(revision 2f71e7b11bdbc7f4f5805fecdaf3303f4ed6b42a)
@@ -4,6 +4,6 @@
 -->
 
-<!ENTITY day          "05">                   <!-- Always 2 digits -->
-<!ENTITY month        "15">                   <!-- Always 2 digits -->
+<!ENTITY day          "18">                   <!-- Always 2 digits -->
+<!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2007">
 <!ENTITY version      "svn-&year;&month;&day;">
@@ -564,5 +564,5 @@
 
 <!-- Chapter 37 -->
-<!ENTITY thunderbird-version          "1.5.0.9">
+<!ENTITY thunderbird-version          "2.0.0.0">
 <!ENTITY pan-version                  "0.14.2">
 <!ENTITY balsa-version                "2.3.13">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 841a93f86caa604701a2671f23fab43d3d5f4922)
+++ introduction/welcome/changelog.xml	(revision 2f71e7b11bdbc7f4f5805fecdaf3303f4ed6b42a)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>May 18th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Updated to Thunderbird-2.0.0.0 with
+          Enigmail-0.95.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 13th, 2007</para>
       <itemizedlist>
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 841a93f86caa604701a2671f23fab43d3d5f4922)
+++ xsoft/other/thunderbird.xml	(revision 2f71e7b11bdbc7f4f5805fecdaf3303f4ed6b42a)
@@ -7,12 +7,13 @@
   <!ENTITY thunderbird-download-http     "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;-source.tar.bz2">
   <!ENTITY thunderbird-download-ftp      "ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;-source.tar.bz2">
-  <!ENTITY thunderbird-md5sum            "bb74629a8d99a6653c5ab978cf9c6227">
-  <!ENTITY thunderbird-size              "34.3 MB">
-  <!ENTITY thunderbird-buildsize         "597 MB">
-  <!ENTITY thunderbird-time              "18.1 SBU">
-
-  <!ENTITY thunderbird-enigmail-version  "0.94.2">
+  <!ENTITY thunderbird-md5sum            "8e672d9f9206e0e1f03790dacb51e1bb">
+  <!ENTITY thunderbird-size              "35.6 MB">
+  <!ENTITY thunderbird-buildsize         "465 MB">
+  <!ENTITY thunderbird-time              "12.3 SBU">
+
+  <!ENTITY thunderbird-enigmail-version  "0.95.0">
   <!ENTITY thunderbird-enigmail-download "http://www.mozilla-enigmail.org/downloads/src/enigmail-&thunderbird-enigmail-version;.tar.gz">
-  <!ENTITY thunderbird-enigmail-md5sum   "cc1ba2bec7c3a2ac408ef24fbf1884de">
+  <!ENTITY thunderbird-enigmail-md5sum   "820ab216b6ba21f81392d56bb9991c18">
+  <!ENTITY thunderbird-enigmail-size     "556 KB">
 ]>
 
@@ -57,22 +58,4 @@
       <listitem>
         <para>Estimated build time: &thunderbird-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch (if using system-installed versions of
-        <application>NSS</application> and <application>NSPR</application>:)
-        <ulink
-        url="&patch-root;/thunderbird-&thunderbird-version;-system_nss-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Required patch (if enabling <application>Pango</application>
-        font rendering):
-        <ulink
-        url="&patch-root;/thunderbird-&thunderbird-version;-pangoxft-1.patch"/>
-        </para>
       </listitem>
     </itemizedlist>
@@ -92,4 +75,7 @@
       <listitem>
         <para>Download MD5 sum: &thunderbird-enigmail-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &thunderbird-enigmail-size;</para>
       </listitem>
     </itemizedlist>
@@ -240,21 +226,13 @@
 EOF</userinput></screen>
 
-    <para>If you wish to use <application>Pango</application> for font
-    rendering and have uncommented the appropriate option in
-    <filename>.mozconfig</filename>, apply the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../thunderbird-&thunderbird-version;-pangoxft-1.patch</userinput></screen>
-
-    <para>If you have system-installed Network Security Services (NSS) and
-    Netscape Portable Runtime (NSPR) libraries and you uncommented the
-    appropriate lines in the <filename>.mozconfig</filename> file to utilize
-    them, apply the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../thunderbird-&thunderbird-version;-system_nss-1.patch</userinput></screen>
-
     <para>Compile <application>Thunderbird</application> by
     issuing the following commands:</para>
 
-<screen><userinput>sed -i "s/^    enum$/&amp; xptinfo_enum_1/" \
+<screen><userinput>cat &gt;&gt; layout/build/Makefile.in &lt;&lt; "EOF" &amp;&amp;
+ifdef MOZ_ENABLE_CANVAS
+EXTRA_DSO_LDOPTS += -lX11 -lXrender
+endif
+EOF
+sed -i "s/^    enum$/&amp; xptinfo_enum_1/" \
     xpcom/reflect/xptinfo/public/xptinfo.h &amp;&amp;
 make -f client.mk build</userinput></screen>
@@ -270,5 +248,5 @@
 make -C ../thunderbird-build/mailnews/extensions/enigmail &amp;&amp;
 make -C ../thunderbird-build/mailnews/extensions/enigmail \
-        XPIFILE=enigmail.xpi xpi</userinput></screen>
+        XPIFILE=enigmail-&thunderbird-enigmail-version;.xpi xpi</userinput></screen>
 
     <para>Install <application>Thunderbird</application> by running the following
@@ -280,10 +258,9 @@
     /usr/include/thunderbird-&thunderbird-version;/ldap &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>
+install -v -m755 -d /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/en-US &amp;&amp;
+install -v -m644 ../thunderbird-build/dist/bin/isp/*.{rdf,sfd} \
+    /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/ &amp;&amp;
+install -v -m644 ../thunderbird-build/dist/bin/isp/en-US/*.rdf \
+    /usr/lib/thunderbird-&thunderbird-version;/defaults/isp/en-US/</userinput></screen>
 
     <para>If you built <application>Thunderbird</application> utilizing
@@ -313,6 +290,6 @@
     <filename>.xpi</filename> file:</para>
 
-<screen role="root"><userinput>install -v -m644 -D ../thunderbird-build/dist/bin/enigmail.xpi \
-    /usr/lib/thunderbird-&thunderbird-version;/xpi_store/enigmail.xpi</userinput></screen>
+<screen role="root"><userinput>install -v -m644 -D ../thunderbird-build/dist/bin/enigmail-&thunderbird-enigmail-version;.xpi \
+    /usr/lib/thunderbird-&thunderbird-version;/xpi_store/enigmail-&thunderbird-enigmail-version;.xpi</userinput></screen>
 
     <para>If you want to install <application>Enigmail</application> globally
@@ -324,5 +301,5 @@
 
 <screen role="root"><userinput>/usr/bin/thunderbird -install-global-extension \
-    /usr/lib/thunderbird-&thunderbird-version;/xpi_store/$ENIGMAIL_FILENAME</userinput></screen>
+    /usr/lib/thunderbird-&thunderbird-version;/xpi_store/enigmail-&thunderbird-enigmail-version;.xpi</userinput></screen>
 
     <para>Global installation of other extensions can be done using the same
@@ -360,4 +337,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><command>'EXTRA_DSO_LDOPTS' += -lX11 -lXrender ...</command>:
+    Building the layout backend will break when the canvas element is enabled
+    without adding these two required libraries.</para>
 
     <para><command>sed -i "s/^    enum$/&amp; xptinfo_enum_1/" ...</command>:
@@ -384,6 +365,6 @@
     <application>Enigmail</application>.</para>
 
-    <para><command>install .../movemail.rdf .../rss.rdf ...</command>: These
-    commands are used to install two files inadvertently left out of the
+    <para><command>install .../*.{rdf,sfd}</command>: These commands are used
+    to install a few mail extensions inadvertantly left out of the
     installation script.</para>
 
