diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
index 3691791741ba..c4b477fcec5a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/builder.sh
@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-export NIX_LDFLAGS="$NIX_LDFLAGS -lsqlite3"
-
 postInstall() {
 
     # Strip some more stuff
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
index f72a97bd8ec3..47cc4a93001d 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
-, libjpeg, libpng, zlib, cairo, sqlite
+, libjpeg, libpng, zlib, cairo
 
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Mail", enable this option.  However, those
@@ -11,18 +11,17 @@
 }:
 
 stdenv.mkDerivation {
-  name = "thunderbird-2.0.0.23";
+  name = "thunderbird-2.0.0.21";
 
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/source/thunderbird-2.0.0.23-source.tar.bz2;
-    sha1 = "a237bfb92ec9c4b2bed7ea744e95d01ec43e07f1";
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.21/source/thunderbird-2.0.0.21-source.tar.bz2;
+    sha1 = "8bb2f7ce60635f6082c3c4542fff10c4b7445dc0";
   };
 
   buildInputs = [
     pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
-    sqlite
   ];
 
   patches = [
@@ -52,6 +51,5 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Mozilla Thunderbird, a full-featured email client";
-    maintainers = [stdenv.lib.maintainers.eelco];
   };
 }