diff --git a/pkgs/applications/networking/browsers/firefox-3/builder.sh b/pkgs/applications/networking/browsers/firefox-3/builder.sh
deleted file mode 100644
index 66f1059d657f..000000000000
--- a/pkgs/applications/networking/browsers/firefox-3/builder.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-source $stdenv/setup
-
-postInstall=postInstall
-postInstall() {
-
-    # Strip some more stuff
-    strip -S $out/lib/*/* || true
-
-    # This fixes starting Firefox when there already is a running
-    # instance.  The `firefox' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d firefox-*)
-    test -n "$libDir"
-    cd $out/bin
-    mv firefox ../lib/$libDir/
-    ln -s ../lib/$libDir/firefox .
-
-    # Register extensions etc.
-    echo "running firefox -register..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false
-
-    echo "running regxpcom..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false
-
-    # Put the Firefox icon in the right place.
-    ensureDir $out/lib/$libDir/chrome/icons/default
-    ln -s ../../../icons/default.xpm  $out/lib/$libDir/chrome/icons/default/
-}
-
-genericBuild
diff --git a/pkgs/applications/networking/browsers/firefox-3/default.nix b/pkgs/applications/networking/browsers/firefox-3/default.nix
index 7f8f0eed65ab..544bb61f5e32 100644
--- a/pkgs/applications/networking/browsers/firefox-3/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-3/default.nix
@@ -1,19 +1,27 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig
+
+, # If you want the resulting program to call itself "Firefox" instead
+  # of "Deer Park", enable this option.  However, those binaries may
+  # not be distributed without permission from the Mozilla Foundation,
+  # see http://www.mozilla.org/foundation/trademarks/.
+  enableOfficialBranding ? false
+    
+}:
 
 stdenv.mkDerivation {
-  name = "firefox-3.0-beta-3";
+  name = "firefox-3.0";
 
   src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0rc2/source/firefox-3.0rc2-source.tar.bz2;
-    #url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0b5/source/firefox-3.0b5-source.tar.bz2;
-    #url = ftp://ftp.mozilla.org/pub/firefox/releases/3.0b4/source/firefox-3.0b5-source.tar.bz2;
-    sha256 = "13g1ipnjxq4ssfj6f6pdp9rjdadb5sydfsgx6a5pqvxhzch5nq6i";
+    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2;
+    sha256 = "1l1wp3w8zck55fr3spzfzzmgh326vifixa2cdiq3hf4wflf3yr36";
   };
 
   buildInputs = [
-    pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
-    python curl coreutils dbus dbus_glib pango freetype fontconfig 
-    libX11 libXrender libXft libXt
+    pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
+    python dbus dbus_glib pango freetype fontconfig
+    xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
   ];
 
   configureFlags = [
@@ -23,8 +31,11 @@ stdenv.mkDerivation {
     "--enable-strip"
     "--with-system-jpeg"
     "--with-system-zlib"
-    #"--with-system-png" <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-    #"--enable-system-cairo" <-- disabled for now because Firefox needs a alpha version of Cairo
+    "--with-system-bz2"
+    # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
+    "--enable-system-cairo" # <-- disabled for now because Firefox needs a alpha version of Cairo
+    #"--enable-system-sqlite" # <-- this seems to be discouraged
+    "--disable-crashreporter"
   ];
 
   postInstall = ''
diff --git a/pkgs/os-specific/linux/kvm/12.nix b/pkgs/os-specific/linux/kvm/12.nix
deleted file mode 100644
index 21b5790c6f0f..000000000000
--- a/pkgs/os-specific/linux/kvm/12.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib}:
-
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation {
-  name = "kvm-12";
-   
-  src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-12.tar.gz;
-    sha256 = "0w2w4kzir1qsapfav30bhng061570zl12ycyvpgwlx2br4s9mlmw";
-  };
-
-  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
-
-  # e2fsprogs is needed for libuuid.
-  buildInputs = [zlib e2fsprogs SDL alsaLib];
-
-  preConfigure = "for i in configure user/configure; do substituteInPlace $i --replace /bin/bash $shell; done";
-}
diff --git a/pkgs/os-specific/linux/kvm/17.nix b/pkgs/os-specific/linux/kvm/17.nix
deleted file mode 100644
index 4e93909e2a00..000000000000
--- a/pkgs/os-specific/linux/kvm/17.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib}:
-   
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation {
-  name = "kvm-17";
-   
-  src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-17.tar.gz;
-    sha256 = "1c9g92258wbadh6q8m9vp4zszbr50a5crn93iy69s5bkg3n3vs43";
-  };
-
-  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
-
-  # e2fsprogs is needed for libuuid.
-  buildInputs = [zlib e2fsprogs SDL alsaLib];
-
-  preConfigure = "for i in configure user/configure; do substituteInPlace $i --replace /bin/bash $shell; done";
-}
diff --git a/pkgs/os-specific/linux/kvm/49.nix b/pkgs/os-specific/linux/kvm/49.nix
deleted file mode 100644
index b49ba450969c..000000000000
--- a/pkgs/os-specific/linux/kvm/49.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib}:
-   
-assert stdenv.isLinux;
-   
-stdenv.mkDerivation {
-  name = "kvm-49";
-   
-  src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-49.tar.gz;
-    sha256 = "0ml7dlxg6alhrhdlp83j53bpwlbn3nfl8dga5jrmhaqmzpx4d8kp";
-  };
-
-  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
-
-  # e2fsprogs is needed for libuuid.
-  buildInputs = [zlib e2fsprogs SDL alsaLib];
-
-  preConfigure = "for i in configure user/configure; do substituteInPlace $i --replace /bin/bash $shell; done";
-}
diff --git a/pkgs/os-specific/linux/kvm/70.nix b/pkgs/os-specific/linux/kvm/70.nix
new file mode 100644
index 000000000000..ae7a1823596b
--- /dev/null
+++ b/pkgs/os-specific/linux/kvm/70.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
+   
+assert stdenv.isLinux;
+   
+stdenv.mkDerivation {
+  name = "kvm-70";
+   
+  src = fetchurl {
+    url = mirror://sourceforge/kvm/kvm-70.tar.gz;
+    sha256 = "16953f6z9f8hlvpmikwwn1n9k96zywq2wfj36xighwqkbvbdrlx0";
+  };
+
+  patches = [
+    # Allow setting the path to Samba through $QEMU_SMBD_COMMAND.
+    ./smbd-path.patch
+    # The makefile copies stuff from the kernel directory and then
+    # tries to modify the copy, but it must be made writable first.
+    ./readonly-kernel.patch
+  ];
+
+  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
+
+  # e2fsprogs is needed for libuuid.
+  # rsync is a weird dependency used for copying kernel header files.
+  buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync];
+
+  preConfigure = ''
+    for i in configure user/configure; do
+      substituteInPlace $i --replace /bin/bash $shell
+    done
+    substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
+  '';
+
+  meta = {
+    homepage = http://kvm.qumranet.com/;
+    description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3271de81bac..26e941468035 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4975,24 +4975,6 @@ let pkgs = rec {
 
   kvm = kvm57;
 
-  kvm12 = import ../os-specific/linux/kvm/12.nix {
-    inherit fetchurl zlib e2fsprogs SDL alsaLib;
-    stdenv = overrideGCC stdenv gcc34;
-    kernelHeaders = stdenv.gcc.libc.kernelHeaders;
-  };
-
-  kvm17 = import ../os-specific/linux/kvm/17.nix {
-    inherit fetchurl zlib e2fsprogs SDL alsaLib;
-    stdenv = overrideGCC stdenv gcc34;
-    kernelHeaders = kernelHeaders_2_6_21;
-  };
-
-  kvm49 = import ../os-specific/linux/kvm/49.nix {
-    inherit fetchurl zlib e2fsprogs SDL alsaLib;
-    stdenv = overrideGCC stdenv gcc34;
-    kernelHeaders = kernelHeaders_2_6_23;
-  };
-
   kvm57 = import ../os-specific/linux/kvm/57.nix {
     inherit fetchurl zlib e2fsprogs SDL alsaLib;
     stdenv = overrideGCC stdenv gcc34;
@@ -5005,6 +4987,12 @@ let pkgs = rec {
     kernelHeaders = kernelHeaders_2_6_26;
   };
 
+  kvm70 = import ../os-specific/linux/kvm/70.nix {
+    inherit fetchurl zlib e2fsprogs SDL alsaLib pkgconfig rsync;
+    stdenv = overrideGCC stdenv gcc34;
+    kernelHeaders = kernelHeaders_2_6_26;
+  };
+
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv attr;
   };
@@ -5770,10 +5758,9 @@ let pkgs = rec {
 
   firefox3 = lowPrio (import ../applications/networking/browsers/firefox-3 {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
-      python curl coreutils dbus dbus_glib freetype fontconfig;
+      python dbus dbus_glib freetype fontconfig bzip2 xlibs;
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
-    inherit (xlibs) libXi libX11 libXrender libXft libXt;
     #enableOfficialBranding = true;
   });