diff --git a/boot/builder.sh b/boot/builder.sh
index e86d2d416685..5ebfadcbcf79 100755
--- a/boot/builder.sh
+++ b/boot/builder.sh
@@ -35,6 +35,7 @@ for i in $boot $halt $login $env; do
         -e "s^@gzip\@^$gzip^g" \
         -e "s^@gcc\@^$gcc^g" \
         -e "s^@mingetty\@^$mingetty^g" \
+        -e "s^@grub\@^$grub^g" \
         -e "s^@out\@^$out^g" \
         < $i > $dst
     chmod +x $dst
diff --git a/boot/default.nix b/boot/default.nix
index 76125381301a..5320404b7334 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,7 +1,7 @@
 { 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, gnugrep
-, gnutar, gzip, mingetty}:
+, gnutar, gzip, mingetty, grub}:
 
 derivation {
   name = "boot";
@@ -14,5 +14,5 @@ derivation {
   inherit 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;
+          gnutar gnugrep gzip mingetty grub;
 }
diff --git a/boot/env.sh b/boot/env.sh
index 322a2cd22167..6ec13130b663 100644
--- a/boot/env.sh
+++ b/boot/env.sh
@@ -1 +1 @@
-export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:@gcc@/bin:@subversion@/bin:@which@/bin:@wget@/bin:@vim@/bin:@less@/bin:@screen@/bin:@openssh@/bin:@binutils@/bin:@strace@/bin:@shadowutils@/bin:@shadowutils@/sbin:@iputils@/bin:@gnumake@/bin:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin
+export PATH=@nix@/bin:@bash@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@sysvinit@/bin:@sysvinit@/sbin:@e2fsprogs@/bin:@e2fsprogs@/sbin:@nettools@/bin:@nettools@/sbin:@gcc@/bin:@subversion@/bin:@which@/bin:@wget@/bin:@vim@/bin:@less@/bin:@screen@/bin:@openssh@/bin:@binutils@/bin:@strace@/bin:@shadowutils@/bin:@shadowutils@/sbin:@iputils@/bin:@gnumake@/bin:@curl@/bin:@gnused@/bin:@gnutar@/bin:@gnugrep@/bin:@gzip@/bin:@mingetty@/sbin:@grub@/bin:@grub@/sbin
diff --git a/make-disk.sh b/make-disk.sh
index 7a0b04f23f31..2548f0e77889 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -5,7 +5,7 @@ manifest=${archivesDir}/MANIFEST
 nixpkgs=/nixpkgs2/trunk/pkgs
 fill_disk=$archivesDir/scripts/fill-disk.sh
 
-chmod -R +w ${archivesDir}/*
+chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
 
 NIX_CMD_PATH=/nix/bin
diff --git a/pkgs.nix b/pkgs.nix
index eb55e1a772cb..42fbfef64760 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -2,12 +2,13 @@ rec {
   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;
+    strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
+    mingetty grub;
 
   boot = (import ./boot) {inherit 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;};
+    gnused gnutar gnugrep gzip mingetty grub;};
 
   everything = [boot sysvinit];
 }