diff --git a/pkgs/os-specific/linux/kernelscripts/builder.sh b/pkgs/os-specific/linux/kernelscripts/builder.sh
index 54106d65b859..8d01d397d1e9 100755
--- a/pkgs/os-specific/linux/kernelscripts/builder.sh
+++ b/pkgs/os-specific/linux/kernelscripts/builder.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -e
 
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir $out
 mkdir $out/bin
diff --git a/pkgs/os-specific/linux/kernelscripts/kernel.nix b/pkgs/os-specific/linux/kernelscripts/kernel.nix
index 3a799a5ea4d1..b95db4c47101 100644
--- a/pkgs/os-specific/linux/kernelscripts/kernel.nix
+++ b/pkgs/os-specific/linux/kernelscripts/kernel.nix
@@ -1,5 +1,5 @@
 rec {
-  inherit (import /nixpkgs/trunk/pkgs/system/i686-linux.nix)
+  inherit (import /nixpkgs/trunk/pkgs/top-level/all-packages.nix {})
     stdenv kernel ov511;
 
   everything = [kernel ov511];