diff --git a/make-disk.sh b/make-disk.sh
index 9d3f1124117c..4ef319bcb089 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -1,5 +1,6 @@
 #! /bin/sh -e
 
+# deps is an array
 declare -a deps
 
 archivesDir=/tmp/arch
@@ -8,7 +9,9 @@ nixpkgs=/nixpkgs/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 storePaths=$archivesDir/mystorepaths
 validatePaths=$archivesDir/validatepaths
+bootiso=/tmp/nixos.iso
 
+# keep chmod happy
 touch ${archivesDir}/blah
 chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
@@ -28,6 +31,8 @@ nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PAT
 
 syslinux=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).syslinux' | $NIX_CMD_PATH/nix-instantiate -))
 
+kernel=$($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
 #nixDeps=$($NIX_CMD_PATH/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -)))
@@ -77,7 +82,18 @@ echo copying bootimage
 mkdir ${archivesDir}/isolinux
 cp ${syslinux}/lib/syslinux/isolinux.bin ${archivesDir}/isolinux
 chmod u+w ${archivesDir}/isolinux/*
-mkisofs -rJ -o /tmp/nix-pull.iso -b isolinux/isolinux.bin -c isolinux/boot.cat \
+
+echo copying kernel
+
+# By following the symlink we don't have to know the version number
+# of the kernel here.
+cp -L $kernel/vmlinuz ${archivesDir}/isolinux/linux
+
+# echo making ramdisk
+# todo!
+
+echo creating ISO image
+
+mkisofs -rJ -o ${bootiso} -b isolinux/isolinux.bin -c isolinux/boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
                 ${archivesDir}
-
diff --git a/pkgs.nix b/pkgs.nix
index 5ec423bbdb15..28c45b7d44f3 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -10,5 +10,5 @@ rec {
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingetty grub;};
 
-  everything = [boot sysvinit];
+  everything = [boot sysvinit kernel];
 }