diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile
index 4684a67c7..346b891d0 100644
--- a/thunderbird/Pkgfile
+++ b/thunderbird/Pkgfile
@@ -11,12 +11,16 @@ source=(http://mozilla.snt.utwente.nl/$name/releases/$version/source/$name-$vers
     $name.desktop)
 
 build() {
-    cd comm-1.9.1
+    #cd comm-1.9.1/mozilla
+    #patch -p 1 -i $SRC/breakpad.patch
+    cd $SRC/comm-1.9.1
     ./configure --prefix=/usr \
         --enable-application=mail \
 	--with-system-{nspr,nss} \
 	--with-system-jpeg \
 	--with-system-zlib \
+        --with-system-bz2 \
+        --with-pthreads \
 	--enable-official-branding \
         --with-distribution-id=CRUX \
         --disable-gnomevfs \
@@ -27,7 +31,8 @@ build() {
         --enable-system-cairo \
         --enable-system-sqlite \
         --disable-tests \
-        --with-default-mozilla-five-home
+        --with-default-mozilla-five-home \
+        --disable-crashreporter
         # crux libpng doesn't support apng
         # --with-system-png
     make
diff --git a/thunderbird/breakpad.patch b/thunderbird/breakpad.patch
new file mode 100644
index 000000000..d1949b0ce
--- /dev/null
+++ b/thunderbird/breakpad.patch
@@ -0,0 +1,35 @@
+Bug 485019: #include <cstdio> where needed.
+
+diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
+--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
++++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
+@@ -36,6 +36,7 @@
+ 
+ #include <cassert>
+ #include <cstdlib>
++#include <cstdio>
+ #include <ctime>
+ #include <linux/limits.h>
+ 
+diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
+--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
++++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
+@@ -39,6 +39,7 @@
+ #include <sys/wait.h>
+ 
+ #include <cstdlib>
++#include <cstdio>
+ #include <ctime>
+ #include <string.h>
+ 
+diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+@@ -30,6 +30,7 @@
+ #include <a.out.h>
+ #include <cstdarg>
+ #include <cstdlib>
++#include <cstdio>
+ #include <cxxabi.h>
+ #include <elf.h>
+ #include <errno.h>