diff --git a/make-disk.sh b/make-disk.sh
index 44564a583625..00fb5d205bae 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -2,7 +2,9 @@
 
 archivesDir=/tmp/arch
 manifest=${archivesDir}/MANIFEST
-nixpkgs=/nixpkgs/trunk/pkgs
+nixpkgs=/nixpkgs2/trunk/pkgs
+
+rm -rf ${archivesDir}/*
 
 NIX_CMD_PATH=/nix/bin
 
@@ -16,4 +18,6 @@ $NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr)
 # Location of Nix boot scripts?
 #bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
 
-cp -a ${nixpkgs} ${archivesDir}
+cp -fa ${nixpkgs} ${archivesDir}
+mkdir ${archivesDir}/scripts
+cp -fa * ${archivesDir}/scripts
diff --git a/pkgs.nix b/pkgs.nix
index 9a3aa3c2c880..eb55e1a772cb 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,5 +1,5 @@
 rec {
-  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
+  inherit (import /nixpkgs2/trunk/pkgs/system/i686-linux.nix)
     stdenv kernel bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip mingetty;