diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
index f011a36e5fa..c243c66c8e4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, libIDL
 , dbus_glib, bzip2, alsaLib, nspr
+, libnotify, cairo, pixman, fontconfig
 
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Shredder", enable this option.  However, those
@@ -10,18 +11,21 @@
     
 }:
 
-let version = "3.0.5"; in
+let version = "3.1"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "c51b6c6a9357578beb7440e4d3cf4594a61fd6a7";
+    sha1 = "89e9d8099a5437ce401577fc4d526eb0dd9e51da";
   };
 
   buildInputs =
-    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr ];
+    [ pkgconfig perl python zip bzip2 gtk dbus_glib alsaLib libIDL nspr libnotify
+      libnotify cairo pixman fontconfig ];
+
+  NIX_LDFLAGS = "-lpixman-1";
 
   configureFlags =
     [ "--enable-application=mail"
@@ -34,6 +38,7 @@ stdenv.mkDerivation {
       "--with-system-nspr"
       "--enable-system-cairo"
       "--disable-crashreporter"
+      "--disable-necko-wifi"
       "--disable-tests"
       "--enable-static" # required by `make install'
     ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fff3365450..6e0206cec12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8747,7 +8747,8 @@ let
   };
 
   thunderbird3 = lowPrio (import ../applications/networking/mailreaders/thunderbird/3.x.nix {
-    inherit fetchurl stdenv pkgconfig perl python dbus_glib zip bzip2 alsaLib nspr;
+    inherit fetchurl stdenv pkgconfig perl python dbus_glib zip bzip2 alsaLib nspr libnotify cairo fontconfig;
+    inherit (xorg) pixman;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;
   });