diff --git a/fill-disk.sh b/fill-disk.sh
index 0c1ecf8081f..fac7eb56197 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -304,11 +304,12 @@ unset NIX_CONF_DIR
 ## Fix this. Probably nix-instantiate, then nix-store -r.
 ## Also make sure everything gets installed into an actual profile!
 
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix nix
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix coreutils
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
-$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A nixUnstable
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A coreutils
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A gnugrep
+#$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernel
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A kernelscripts
+$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix -A grub
 
 cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
 
@@ -370,12 +371,7 @@ fi
 
 version=$strippedName-$kernelhash
 
-make_dir 0755 /lib/modules/$version
-
-ln -s @kernel@/lib/modules/$version/build $root/lib/modules/$version/build
-ln -s @kernel@/lib/modules/$version/kernel $root/lib/modules/$version/kernel
-cp $root/@kernel@/lib/modules/$version/modules.* $root/lib/modules/$version
-chmod 644 $root/lib/modules/$version/modules.*
+ln -s @kernelscripts@/lib/modules/$version $root/lib/modules/$version
 
 ##
 ## init
diff --git a/make-disk.sh b/make-disk.sh
index 4f0f74ab27d..d340c8d0a31 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -43,9 +43,11 @@ nixDeps=$($NIX/nix-store -qR $nix)
 storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
 #storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
 
+kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
+
 ### make NAR files for everything we want to install and some more. Make sure
 ### the right URL is in there, so specify /cdrom and not cdrom
-$NIX/nix-push --copy $archivesDir $manifest --target /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
+$NIX/nix-push --copy $archivesDir $manifest --target /cdrom $storeExpr $($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -)) $kernelscripts
 
 # Location of sysvinit?
 sysvinitPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).sysvinit' | $NIX/nix-instantiate -))
@@ -56,6 +58,7 @@ bootPath=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instan
 syslinux=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).syslinux' | $NIX/nix-instantiate -))
 
 kernel=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX/nix-instantiate -))
+kernelscripts=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).kernelscripts' | $NIX/nix-instantiate -))
 
 #nixDeps=$($NIX/nix-store -qR $(echo '(import ./pkgs.nix).nix' | $NIX/nix-instantiate -))
 
@@ -173,6 +176,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
+    -e "s^@kernelscripts\@^$kernelscripts^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@kudzu\@^$kudzu^g" \
@@ -195,6 +199,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@modutils\@^$modutils^g" \
     -e "s^@grub\@^$grub^g" \
     -e "s^@kernel\@^$kernel^g" \
+    -e "s^@kernelscripts\@^$kernelscripts^g" \
     -e "s^@gnugrep\@^$gnugrep^g" \
     -e "s^@which\@^$which^g" \
     -e "s^@gnutar\@^$gnutar^g" \
diff --git a/pkgs.nix b/pkgs.nix
index 2365e939c13..5f70904f92b 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,12 +1,12 @@
 rec {
   inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
-    stdenv kernel bash bashStatic coreutils coreutilsDiet findutilsWrapper
-    utillinux utillinuxStatic sysvinit e2fsprogsDiet e2fsprogs nettools
-    nixUnstable subversion gcc wget which vim less screen openssh binutils
-    nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
-    gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
-    module_init_toolsStatic dhcpWrapper man nano eject sysklogd mktemp
-    cdrtools cpio busybox;
+    stdenv kernelscripts kernel bash bashStatic coreutils coreutilsDiet
+    findutilsWrapper utillinux utillinuxStatic sysvinit e2fsprogsDiet
+    e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen
+    openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
+    gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
+    module_init_tools module_init_toolsStatic dhcpWrapper man nano eject
+    sysklogd mktemp cdrtools cpio busybox;
 
   boot = (import ./boot) {
     inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
@@ -23,5 +23,5 @@ rec {
   #  nix = nixUnstable;
   #};
 
-  everything = [boot sysvinit sysklogd kernel];
+  everything = [boot sysvinit sysklogd kernelscripts kernel];
 }