diff --git a/pkgs/nix-dist/nix-dist-build.sh b/pkgs/nix-dist/nix-dist-build.sh
new file mode 100755
index 000000000000..e7d0b88a625b
--- /dev/null
+++ b/pkgs/nix-dist/nix-dist-build.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+cp --preserve=all -rv $src nix
+cd nix || exit 1
+cp -p $bdbSrc externals/db-4.0.14.tar.gz || exit 1
+cp -p $atermSrc externals/aterm-2.0.tar.gz || exit 1
+autoreconf -i || exit 1
+./configure || exit 1 
+make dist || exit 1
+cp nix-0.2pre1.tar.gz $out || exit 1
diff --git a/pkgs/nix-dist/nix-dist.fix b/pkgs/nix-dist/nix-dist.fix
new file mode 100644
index 000000000000..6d722d29aad6
--- /dev/null
+++ b/pkgs/nix-dist/nix-dist.fix
@@ -0,0 +1,23 @@
+Package(
+  [ ("name", "nix-dist")
+  , ("build", Relative("nix-dist/nix-dist-build.sh"))
+
+  , ("src", App(IncludeFix("fetchsvn/fetchsvn.fix"),
+      [ ("name", "nix")
+      , ("url", "http://losser.st-lab.cs.uu.nl:12080/repos/trace/nix/trunk")
+      , ("rev", "300")
+      ]))
+
+  , ("bdbSrc", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz")
+      , ("md5", "12262c64fcd64b772e7cffad8e4d0ebc")
+      ]))
+
+  , ("atermSrc", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
+      , ("md5", "853474e4bcf4a85f7d38a0676b36bded")
+      ]))
+
+  , ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+  ]
+)