Index: general.ent
===================================================================
--- general.ent	(revision 9ed32d2c77f755f63fdd95bfc4d134f5a156dcac)
+++ general.ent	(revision 02d3b954444c737485e356b2ed7b8eb5ad68ecce)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "22">                   <!-- Always 2 digits -->
+<!ENTITY day          "25">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
@@ -800,5 +800,5 @@
 
 <!-- Chapter 37 -->
-<!ENTITY thunderbird-version          "8.0">
+<!ENTITY thunderbird-version          "9.0.1">
 <!ENTITY pan-version                  "0.133">
 <!ENTITY balsa-version                "2.3.22">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9ed32d2c77f755f63fdd95bfc4d134f5a156dcac)
+++ introduction/welcome/changelog.xml	(revision 02d3b954444c737485e356b2ed7b8eb5ad68ecce)
@@ -43,4 +43,13 @@
 -->
     <listitem>
+      <para>December 25th, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abenton] - Thunderbird 9.0.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 23rd, 2011</para>
       <itemizedlist>
Index: x/lib/xulrunner.xml
===================================================================
--- x/lib/xulrunner.xml	(revision 9ed32d2c77f755f63fdd95bfc4d134f5a156dcac)
+++ x/lib/xulrunner.xml	(revision 02d3b954444c737485e356b2ed7b8eb5ad68ecce)
@@ -131,5 +131,4 @@
 # ac_add_options --with-system-nss
 # ac_add_options --enable-system-sqlite
-# ac_add_options --enable-system-lcms
 # ac_add_options --with-system-libvpx
 # ac_add_options --enable-startup-notification
@@ -201,9 +200,10 @@
     <para><command>for DL in ...</command>: The NSPR and NSS libraries shipped
     with this package are installed into
-    <filename class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
-    which means they will not be found at runtime.  By using symbolic links from
-    <filename class="directory">/usr/lib</filename> the libraries will be found
-    and the links can be easily changed to point to a newer version during an
-    upgrade.</para>
+    <filename
+    class="directory">/usr/lib/xulrunner-&xulrunner-version;</filename>
+    which means they will not be found at runtime.  By using symbolic links
+    from <filename class="directory">/usr/lib</filename> the libraries will be
+    found and the links can be easily changed to point to a newer version
+    during an upgrade.</para>
 
     <para><command>ln -sv ../mozilla/plugins ...</command>: Some packages will
Index: xsoft/graphweb/firefox.xml
===================================================================
--- xsoft/graphweb/firefox.xml	(revision 9ed32d2c77f755f63fdd95bfc4d134f5a156dcac)
+++ xsoft/graphweb/firefox.xml	(revision 02d3b954444c737485e356b2ed7b8eb5ad68ecce)
@@ -88,5 +88,4 @@
     <para role="optional"><xref linkend="dbus-glib"/>,
     <xref linkend="startup-notification"/>, <xref linkend="sqlite"/>,
-    <ulink url="http://www.webmproject.org/code/">libvpx</ulink>,
     <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
     <xref linkend="doxygen"/>, <xref linkend="gnome-vfs"/> and
@@ -95,5 +94,5 @@
     <xref linkend="xulrunner"/> (linking against an installed xulrunner makes
     Firefox about 32 MB smaller, which is trivial compared to the size of
-    xulrunner), <xref linkend="unzip"/>, <xref linkend="wireless_tools"/>,
+    xulrunner), <xref linkend="wireless_tools"/>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
     the jemalloc code) and <xref linkend="wget"/></para>
Index: xsoft/graphweb/seamonkey.xml
===================================================================
--- xsoft/graphweb/seamonkey.xml	(revision 9ed32d2c77f755f63fdd95bfc4d134f5a156dcac)
+++ xsoft/graphweb/seamonkey.xml	(revision 02d3b954444c737485e356b2ed7b8eb5ad68ecce)
@@ -71,6 +71,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>,
-    <xref linkend="libidl"/>, and <xref linkend="zip"/></para>
+    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>
+    <xref linkend="zip"/> and <xref linkend="unzip"/></para>
 
     <note>
@@ -92,10 +92,9 @@
     <para role="optional"><xref linkend="dbus-glib"/>,
     <xref linkend="startup-notification"/>, <xref linkend="sqlite"/>,
-    <ulink url="http://www.webmproject.org/code/">libvpx</ulink>,
     <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
     <xref linkend="doxygen"/>, <xref linkend="gnome-vfs"/> and
     <xref linkend="libgnomeui"/> (for gnome integration),
     <xref linkend="libnotify"/>, <xref linkend="nspr"/>, <xref linkend="nss"/>,
-    <xref linkend="unzip"/>, <xref linkend="wireless_tools"/>,
+    <xref linkend="wireless_tools"/>,
     <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
     the jemalloc code) and <xref linkend="wget"/></para>
@@ -139,5 +138,4 @@
 # ac_add_options --with-system-nss
 # ac_add_options --enable-system-sqlite
-# ac_add_options --enable-system-lcms
 # ac_add_options --with-system-libvpx
 # ac_add_options --enable-startup-notification
Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 9ed32d2c77f755f63fdd95bfc4d134f5a156dcac)
+++ xsoft/other/thunderbird.xml	(revision 02d3b954444c737485e356b2ed7b8eb5ad68ecce)
@@ -7,8 +7,8 @@
   <!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            "be64630152a2d5a824a76752594e7596">
-  <!ENTITY thunderbird-size              "65 MB">
-  <!ENTITY thunderbird-buildsize         "915 MB">
-  <!ENTITY thunderbird-time              "21">
+  <!ENTITY thunderbird-md5sum            "a5904751dbd33074682b438b732fdbab">
+  <!ENTITY thunderbird-size              "91 MB">
+  <!ENTITY thunderbird-buildsize         "3 GB (46 MB installed)">
+  <!ENTITY thunderbird-time              "26 SBU">
 
 ]>
@@ -61,11 +61,11 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>,
-    <xref linkend="libidl"/> and <xref linkend="zip"/></para>
+    <para role="required"><xref linkend="alsa-lib"/>, <xref linkend="gtk2"/>
+    <xref linkend="zip"/> and <xref linkend="unzip"/></para>
 
     <para>Note: <application>libjpeg</application> and
     <application>libpng</application> (patched for apng support) should have
     been installed before <application>gdk-pixbuf</application> and should
-    exist on your system. If for some strange reason you haven't installed
+    exist on your system. If for some strange reason you haven&apos;t installed
     them, you should remove the <option>--with-system-jpeg</option> and
     <option>--with-system-png</option> options from the
@@ -73,5 +73,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="dbus-glib"/>, <xref linkend="unzip"/>,
+    <para role="optional"><xref linkend="dbus-glib"/>,
     <xref linkend="doxygen"/>, <xref linkend="gnome-vfs"/> and
     <xref linkend="libgnomeui"/> (for gnome integration),
@@ -80,6 +80,6 @@
     <xref linkend="yasm"/> (or <xref linkend="libvpx"/>),
     <ulink url="http://sourceforge.net/projects/hunspell/">Hunspell</ulink>,
-    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing the
-    jemalloc code), and <xref linkend="wget"/></para>
+    <ulink url="http://www.valgrind.org/">Valgrind</ulink> (only for testing
+    the jemalloc code), and <xref linkend="wget"/></para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -116,11 +116,8 @@
 ac_add_options --disable-libnotify
 
-# If you have installed nss and nspr uncomment these two lines:
+# Uncomment these if you have installed them:
 # ac_add_options --with-system-nspr
 # ac_add_options --with-system-nss
-
-# Uncomment these if you have installed them:
 # ac_add_options --enable-system-sqlite
-# ac_add_options --enable-system-lcms
 # ac_add_options --with-system-libvpx
 # ac_add_options --enable-startup-notification
@@ -155,6 +152,6 @@
     user:</para>
 
-<screen role="root"><userinput>tar xf thunderbuild/mozilla/dist/thunderbird-*.tar.bz2 -C /usr/lib &amp;&amp;
-ln -s ../lib/thunderbird/thunderbird /usr/bin/thunderbird</userinput></screen>
+<screen role="root"><userinput>tar xf thunderbuild/mozilla/dist/thunderbird-*.tar.bz2 -C /usr/lib/thunderbird-&thunderbird-version; --strip-components=1 &amp;&amp;
+ln -s ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin/thunderbird</userinput></screen>
 
   </sect2>
@@ -170,8 +167,17 @@
 
     <para><command>make -C thunderbuild/mail/installer</command>: this runs make
-    in the <filename class='directory'>thunderbuild/mail/installer</filename>
+    in the <filename class="directory">thunderbuild/mail/installer</filename>
     folder. This gathers together all the parts of
     <application>Thunderbird</application> and compresses them into a
     tarball.</para>
+
+    <para><command>tar -xfv thunderbuild/mozilla/dist ...</command>: This
+    untars <application>Thunderbird</application>, the <option>-C</option>
+    option uncompresses the files in
+    /usr/lib/thunderbird-&thunderbird-version;. The
+    <option>--strip-components=1</option> option removes the leading
+    &apos;thunderbird&apos; directory from the filenames, allowing us to untar
+    it into a versioned directory.<!-- Running <command>make -C thunderbuild
+    install</command> would install an additional 480 MB of files--></para>
 
   </sect2>
@@ -218,7 +224,5 @@
       url="http://preferential.mozdev.org/preferences.html"/>.</para>
     </tip>
-
     </sect3>
-
   </sect2>
 
@@ -234,8 +238,8 @@
         <seg>thunderbird</seg>
         <seg>Numerous libraries, email/newsgroups components, plugins,
-        extensions, and helper modules installed in
-        <filename class='directory'>/usr/lib/thunderbird</filename>
+        extensions, and helper modules installed in <filename
+        class="directory">/usr/lib/thunderbird-&thunderbird-version;</filename>
         </seg>
-        <seg>/usr/lib/thunderbird</seg>
+        <seg>/usr/lib/thunderbird-&thunderbird-version;</seg>
       </seglistitem>
     </segmentedlist>
@@ -249,5 +253,5 @@
         <term><command>thunderbird</command></term>
         <listitem>
-          <para>is <application>Mozilla</application>'s next-generation
+          <para>is <application>Mozilla</application>&apos;s next-generation
           email and newsgroup client.</para>
           <indexterm zone="thunderbird thunderbird-prog">
@@ -256,7 +260,5 @@
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
 
