diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85acfda8424..72c4114246e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -269,9 +269,11 @@ rec {
   };
 
   findutils = useFromStdenv (stdenv ? findutils) stdenv.findutils
-    (import ../tools/misc/findutils {
-      inherit fetchurl stdenv coreutils;
-    });
+    (if system == "i686-darwin" then findutils4227 else
+      import ../tools/misc/findutils {
+        inherit fetchurl stdenv coreutils;
+      }
+    );
 
   findutils4227 = import ../tools/misc/findutils/4.2.27.nix {
     inherit fetchurl stdenv coreutils;
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 3133b23de25..6cd8b04f6bd 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -45,7 +45,6 @@ let {
     gawk
     gcc
     gcc34
-    gcc40
     ghcWrapper
     ghostscript
     gnugrep