diff --git a/boot/default.nix b/boot/default.nix
index 12d80e54419..588f3d58273 100644
--- a/boot/default.nix
+++ b/boot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
+{ stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs
 , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
 , binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep
 , gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools, hotplug
@@ -12,7 +12,7 @@ derivation {
   halt = ./halt.sh;
   login = ./login.sh;
   env = ./env.sh;
-  inherit stdenv kernel bash bashStatic coreutils findutilsWrapper utillinux sysvinit
+  inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux sysvinit
           e2fsprogs nettools nix subversion gcc wget which vim less screen
           openssh binutils strace shadowutils iputils gnumake curl gnused
           gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
diff --git a/make-disk.sh b/make-disk.sh
index 34a1c2b5f33..f226e216a30 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -225,20 +225,14 @@ chmod u+x ${initdir}/fill-disk.sh
 chmod u+x ${initdir}/ramdisk-login.sh
 #cp -fau --parents ${utilLinux} ${initdir}
 #cp -fau --parents ${coreUtilsDiet} ${initdir}
-#cp -fau --parents ${e2fsProgs} ${initdir}
 #cp -fau --parents ${modUtils} ${initdir}
 #cp -fau --parents ${hotplug} ${initdir}
 cp -fau --parents ${bash}/bin ${initdir}
 cp -fau --parents ${utilLinux}/bin ${initdir}
 chmod -R u+w ${initdir}
-echo utilLinux $utilLinux
 cp -fau --parents ${utilLinux}/sbin ${initdir}
-echo coreutils
+cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${coreutilsdiet}/bin ${initdir}
-cp -fau --parents ${e2fsprogs}/bin ${initdir}
-chmod -R u+w ${initdir}
-echo e2fsprogs
-cp -fau --parents ${e2fsprogs}/sbin ${initdir}
 cp -fau --parents ${modutils}/bin ${initdir}
 chmod -R u+w ${initdir}
 echo modutils
diff --git a/pkgs.nix b/pkgs.nix
index e1a4288c156..d156cddbab8 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -5,9 +5,9 @@ rec {
     nettools nix 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 hotplug udev
-    dhcpWrapper man nano eject sysklogd kudzu;
+    dhcpWrapper man nano eject sysklogd kudzu xawtv;
 
-  boot = (import ./boot) {inherit stdenv kernel bash bashStatic coreutils findutilsWrapper
+  boot = (import ./boot) {inherit stdenv bash bashStatic coreutils findutilsWrapper
     utillinux utillinuxStatic sysvinit e2fsprogs nettools nix subversion gcc wget which vim
     less screen openssh binutils strace shadowutils iputils gnumake curl
     gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools
@@ -17,5 +17,5 @@ rec {
     nix shadowutils mingettyWrapper grubWrapper parted module_init_tools hotplug
     dhcpWrapper man nano eject;};
 
-  everything = [boot sysvinit kernel sysklogd kudzu];
+  everything = [boot sysvinit sysklogd kernel xawtv];
 }