diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b7b95031a17..dcb5d3ce4da 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,22 +1,25 @@
 { stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
+, supportOldDBs ? true
 }:
 
 stdenv.mkDerivation {
-  name = "nix-0.11";
+  name = "nix-0.12";
   
   src = fetchurl {
-    url = http://nixos.org/releases/nix/nix-0.11/nix-0.11.tar.bz2;
-    md5 = "890c25ac0005ff466683869efc288b67";
+    url = http://nixos.org/releases/nix/nix-0.12/nix-0.12.tar.bz2;
+    sha256 = "44454670876ad0e96d551c94ba993903b84594ccf57fef17bc2d92b1f6b155b1";
   };
   
   buildInputs = [perl curl openssl];
 
-  configureFlags = "
+  configureFlags = ''
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
-    --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
-    --disable-init-state";
+    --with-aterm=${aterm} --with-bzip2=${bzip2}
+    ${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"}
+    --disable-init-state
+  '';
 
   meta = {
     description = "The Nix Deployment System";
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 50cfa1fc6cf..fe36f9d94cc 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,14 +4,14 @@
 , supportOldDBs ? true
 }:
 
-let version = "0.12pre12876"; in
+let version = "0.13pre13362"; in
 
 stdenv.mkDerivation {
   name = "nix-${version}";
   
   src = fetchurl {
-    url = "http://nixos.org/releases/nix/nix-${version}-mlwc8b59/nix-${version}.tar.bz2";
-    sha256 = "480767060934ce4866bd2e6975de4964dc9519169e7512369b12750af4bb0238";
+    url = "http://nixos.org/releases/nix/nix-${version}-s1rvr333/nix-${version}.tar.bz2";
+    sha256 = "cf80f5c98c61ec4e271c2a7bde1fb3d36318d1ae8c49fdf91818af150a5d0b47";
   };
 
   buildInputs = [perl curl openssl];