diff --git a/configuration/rescue-cd.nix b/configuration/rescue-cd.nix
index b9b0ffaa0286..08dd24791497 100644
--- a/configuration/rescue-cd.nix
+++ b/configuration/rescue-cd.nix
@@ -87,8 +87,12 @@ rec {
   
   # Put the current directory in a tarball (making sure to filter
   # out crap like the .svn directories).
-  nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource
-    (name: let base = baseNameOf (toString name); in base != ".svn" && base != "result") ./..);
+  nixosTarball =
+    let filter = name: type:
+      let base = baseNameOf (toString name);
+      in base != ".svn" && base != "result";
+    in
+      makeTarball "nixos.tar.bz2" (builtins.filterSource filter ./..);
 
 
   # Get a recent copy of Nixpkgs.
diff --git a/system/upstart.nix b/system/upstart.nix
index 86ca22ca7d98..6ceb2c921631 100644
--- a/system/upstart.nix
+++ b/system/upstart.nix
@@ -23,7 +23,8 @@ import ../upstart-jobs/gather.nix {
     # The udev daemon creates devices nodes and runs programs when
     # hardware events occur.
     (import ../upstart-jobs/udev.nix {
-      inherit (pkgs) writeText cleanSource udev procps;
+      inherit (pkgs) writeText udev procps;
+      inherit (pkgs.lib) cleanSource;
     })
       
     # Makes LVM logical volumes available.