diff --git a/fill-disk.sh b/fill-disk.sh
index c0a71d1c85c0..b9915b8aa01f 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -287,8 +287,8 @@ cp /cdrom/mystorepaths $root/tmp
 
 echo copying store
 
-cp -fva /nix/store/* $root/nix/store
-tar cf - /nix/store | tar --directory=$root -xvf -
+#cp -fva /nix/store/* $root/nix/store
+tar --directory=$root -zxvf /cdrom/nixstore.tgz
 
 echo registering valid paths...
 
diff --git a/make-disk.sh b/make-disk.sh
index 84edfb8c5ed7..c0fc341896ed 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -84,6 +84,8 @@ do
   $gnutar/bin/tar -cf - $i | $gnutar/bin/tar --directory=$archivesDir -xf -
 done
 
+tar zcf ${archivesDir}/nixstore.tgz $combideps
+
 utilLinux=$(nix-store -r $(echo '(import ./pkgs.nix).utillinuxStatic' | $NIX/nix-instantiate -))
 coreUtilsDiet=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -)))
 
@@ -154,24 +156,10 @@ $coreutils/bin/mkdir ${initdir}/var/run
 echo copying nixpkgs
 
 #svn export ${nixpkgs} ${archivesDir}/pkgs
-#$coreutils/bin/cp -fa ${nixpkgs} ${archivesDir}
 tar -zcf  ${archivesDir}/nixpkgs.tgz ${nixpkgs}
 
 #echo copying packages from store
 
-#cp -fa --parents ${nixDeps} ${archivesDir}
-#cp -fvau --parents ${utilLinux} ${archivesDir}
-#cp -fvau --parents ${Grub} ${archivesDir}
-##cp -fau --parents ${gnuSed} ${archivesDir}
-##cp -fau --parents ${gnuGrep} ${archivesDir}
-#cp -fvau --parents ${Kernel} ${archivesDir}
-#cp -fvau --parents ${SysVinit} ${archivesDir}
-#cp -fvau --parents ${BootPath} ${archivesDir}
-#cp -fvau --parents ${udev} ${archivesDir}
-#cp -fvau --parents ${dhcp} ${archivesDir}
-#cp -fvau --parents ${nano} ${archivesDir}
-#cp -fvau --parents ${gnutar} ${archivesDir}
-
 echo copying scripts
 
 $coreutils/bin/mkdir ${archivesDir}/scripts