diff --git a/pkgs/applications/networking/browsers/firebird/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
similarity index 97%
rename from pkgs/applications/networking/browsers/firebird/builder.sh
rename to pkgs/applications/networking/browsers/firefox/builder.sh
index 36225b5760db..917cbc513305 100755
--- a/pkgs/applications/networking/browsers/firebird/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox/builder.sh
@@ -3,7 +3,7 @@
 buildinputs="$pkgconfig $gtk $perl $zip $libIDL"
 . $stdenv/setup || exit 1
 
-tar xvfz $src || exit 1
+tar xvfj $src || exit 1
 cd mozilla || exit 1
 
 cat > .mozconfig <<EOF
diff --git a/pkgs/applications/networking/browsers/firebird/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
similarity index 67%
rename from pkgs/applications/networking/browsers/firebird/default.nix
rename to pkgs/applications/networking/browsers/firefox/default.nix
index b17b4a0e4731..9c7a434c63b4 100644
--- a/pkgs/applications/networking/browsers/firebird/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -7,13 +7,13 @@ assert !isNull pkgconfig && !isNull gtk && !isNull perl
 assert libIDL.glib == gtk.glib;
 
 derivation {
-  name = "MozillaFirebird-0.7";
+  name = "firefox-0.8";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/firebird/releases/0.7/MozillaFirebird-source-0.7.tar.gz;
-    md5 = "35112566a3dca5bdf363972056afc462";
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.8/firefox-source-0.8.tar.bz2;
+    md5 = "cdc85152f4219bf3e3f1a8dc46e04654";
   };
 
   stdenv = stdenv;
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 1906c39b03d1..41559900e653 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -576,7 +576,7 @@
     gtk = gtk1;
   };
 
-  firebird = (import ../applications/networking/browsers/firebird) {
+  firefox = (import ../applications/networking/browsers/firefox) {
     inherit fetchurl stdenv pkgconfig gtk perl zip libIDL;
   };
 
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 032b27729e04..9f57ce738ede 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -34,7 +34,7 @@ let {
       pkgs.subversion
       pkgs.pan
       pkgs.sylpheed
-      pkgs.firebird
+      pkgs.firefox
       pkgs.MPlayer
       pkgs.MPlayerPlugin
       pkgs.vlc