diff --git a/make-disk.sh b/make-disk.sh
index fd6152fd2e8..101c1b7f977 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -12,8 +12,9 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan
 gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -))
 gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -))
 cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -))
-coreutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
-gzip=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
+coreutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -))
+gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -))
+cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))
 
 archivesDir=$($mktemp/bin/mktemp -d)
 manifest=${archivesDir}/MANIFEST
@@ -249,7 +250,7 @@ $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
 
 $coreutils/bin/touch ${archivesDir}/NIXOS
 
-(cd ${initdir}; find . |cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd}
+(cd ${initdir}; find . |$cpio/bin/cpio -H newc -o) | $gzip/bin/gzip -9 > ${initrd}
 
 $coreutils/bin/chmod -f -R +w ${initdir}/*
 $coreutils/bin/rm -rf ${initdir}
diff --git a/pkgs.nix b/pkgs.nix
index e2005944648..0762f3e2099 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,7 +5,7 @@ rec {
     nettools nixUnstable subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
     mingettyWrapper grubWrapper syslinux parted module_init_tools module_init_toolsStatic udev
-    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools;
+    dhcpWrapper man nano eject sysklogd kudzu xawtv mktemp cdrtools cpio;
 
   boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which vim