Index: xsoft/other/thunderbird.xml
===================================================================
--- xsoft/other/thunderbird.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ xsoft/other/thunderbird.xml	(revision 07c39524998481ff650c84a16e9fc68fd24f62d5)
@@ -11,6 +11,6 @@
   <!ENTITY thunderbird-md5sum            "6bb66f5cb67d573939d4e2ead6f7c7ca">
   <!ENTITY thunderbird-size              "164 MB">
-  <!ENTITY thunderbird-buildsize         " 3.7 GB (68 MB installed)">
-  <!ENTITY thunderbird-time              "13 SBU (using parallelism=8)">
+  <!ENTITY thunderbird-buildsize         "4.7 GB (68 MB installed)">
+  <!ENTITY thunderbird-time              "56 SBU">
 ]>
 
@@ -80,6 +80,6 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="zip"/> and
-      <xref linkend="unzip"/>
+      <xref linkend="unzip"/> and
+      <xref linkend="zip"/>
     </para>
 
@@ -138,5 +138,5 @@
       <xref linkend="startup-notification"/>,
       <xref linkend="wget"/>,
-      <xref linkend="wireless_tools"/>, and
+      <xref linkend="wireless_tools"/> and
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
     </para>
@@ -161,8 +161,7 @@
 
 <screen><userinput>cat &gt; mozconfig &lt;&lt; "EOF"
-<literal># If you have a multicore machine, the build may be faster if using parallel
-# jobs. The build system automatically adds -jN to the "make" flags, where N
-# is the number of CPU cores. The option below is therefore useless, unless
-# you want to use a smaller number of jobs:
+<literal># If you have a multicore machine, thunderbird will now use all the cores by
+# default. Exceptionally, you can reduce the number of cores, e.g. to 1,
+# by uncommenting the next line and setting a valid number of CPU cores.
 #mk_add_options MOZ_MAKE_FLAGS="-j1"
 
@@ -214,5 +213,4 @@
 ac_add_options --disable-tests
 
-ac_add_options --enable-optimize
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
@@ -238,11 +236,10 @@
 
     <para>
-      First, a bug needs to be fixed. Notice that thunderbuild needs to match
-      the value used in mozconfig (above) for the object directory (MOZ_OBJDIR):
-    </para>
-
-<!-- might be necessary
-test $(uname -m) = "i686" && sed -i 's/enable-optimize/disable-optimize/' mozconfig || true &&-->
-<screen><userinput>mkdir -vp mozilla/thunderbuild</userinput></screen>
+      First, a bug needs to be fixed. Note that thunderbuild matches
+      the value used in mozconfig above for the object directory
+      (MOZ_OBJDIR):
+    </para>
+
+<screen><userinput>mkdir -pv mozilla/thunderbuild</userinput></screen>
 
     <para>
@@ -251,11 +248,5 @@
     </para>
 
-    <note><para>
-      If you are compiling <application>Thunderbird</application> in chroot,
-      prepend <envar>SHELL=/bin/sh</envar> to the <!--first -->make command below.
-    </para></note>
-
-<screen><userinput>make -f client.mk<!--
-make -C thunderbuild/mail/installer--></userinput></screen>
+<screen><userinput>make -f client.mk</userinput></screen>
 
     <para>
@@ -267,9 +258,4 @@
       commands as the <systemitem class="username">root</systemitem> user:
     </para>
-
-<!--<screen role="root"><userinput>mkdir -pv /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
-tar -xvf thunderbuild/mozilla/dist/thunderbird-&thunderbird-version;.en-US.linux-$(uname -m).tar.bz2 \
-    -C /usr/lib/thunderbird-&thunderbird-version; -\-strip-components=1 &amp;&amp;
-ln -sfv ../lib/thunderbird-&thunderbird-version;/thunderbird /usr/bin</userinput></screen>-->
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK=</userinput></screen>
@@ -284,20 +270,9 @@
 
 <screen role="root"><userinput>make -C thunderbuild install</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!-- might be necessary
-    <para>
-      <command>test $(uname -m) = "i686" &amp;&amp; sed ...</command>: On this
-      version of thunderbird, an old bug has reappeared in 32-bit builds.  With
-      optimization, the install fails with a Python error.  This command will
-      fix i686 builds and preserve the optimization on x86_64.
-    </para>-->
-
-    <para>
-      <command>mkdir -vp mozilla/thunderbuild</command>: fixes a build failure
-      of Makefile at the beginning of build, where a file cannot be found.
-    </para>
 
     <para>
@@ -386,7 +361,14 @@
 EOF
 
-ln -sfv /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default256.png \
-        /usr/share/pixmaps/thunderbird.png</userinput></screen>
+for s in 16 22 24 32 48 256
+do
+install -v -Dm644 /usr/lib/thunderbird-&thunderbird-version;/chrome/icons/default/default${s}.png \
+                  /usr/share/icons/hicolor/${s}x${s}/apps/thunderbird.png
+done &amp;&amp;
+gtk-update-icon-cache -qf /usr/share/icons/hicolor &amp;&amp;
+unset s</userinput></screen>
+
     </sect3>
+
   </sect2>
 
