diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
index 16575fc1cdc..411cb867a98 100644
--- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
+++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
 ensureDir $out/bin
-for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip; do 
+for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil; do 
     ln -s /usr/bin/$i $out/bin/
 done
diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc-apple/default.nix
index 815f97695c5..1af4fb04670 100644
--- a/pkgs/development/compilers/gcc-apple/default.nix
+++ b/pkgs/development/compilers/gcc-apple/default.nix
@@ -9,11 +9,11 @@ assert stdenv.isDarwin;
 assert langF77 -> gmp != null;
 
 stdenv.mkDerivation ({
-  name = "gcc-4.2.1-apple-5531";
+  name = "gcc-4.0.1-apple-5484";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.opensource.apple.com/tarballs/gcc_42/gcc_42-5531.tar.gz ;
-    sha256 = "0bk37axx202x0ll1f8q00p233n3j8zga09ljxia1g89g17i64j4j";
+    url = http://www.opensource.apple.com/tarballs/gcc/gcc-5484.tar.gz ;
+    sha256 = "1cxz9mamb1673b73wywy9v28js04ay73lflpqk78zny5n07c2gv1";
   };
   patches =
     [./pass-cxxcpp.patch]
diff --git a/pkgs/os-specific/linux/e2fsprogs/1.41.5.nix b/pkgs/os-specific/linux/e2fsprogs/1.41.5.nix
index 1d123fdebaa..8d72e9fc439 100644
--- a/pkgs/os-specific/linux/e2fsprogs/1.41.5.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/1.41.5.nix
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
   };
   
   configureFlags =
-    if stdenv ? isDietLibC
+    (if stdenv ? isDietLibC
     then "--with-diet-libc"
-    else "--enable-elf-shlibs";
+    else (if stdenv.system == "i686-darwin" then " --enable-bsd-shlibs" else "--enable-elf-shlibs" ) ) ;
 
   preBuild = if stdenv ? isDietLibC then ''
     sed -e 's/-lpthread//' -i Makefile */Makefile */*/Makefile
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 4f44d61108e..dc1820c48d3 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   
   buildInputs = [pcre];
 
-  doCheck = true;
+  doCheck = if stdenv.system == "i686-darwin" then false else true;
 
   # On Mac OS X, force use of mkdir -p, since Grep's fallback
   # (./install-sh) is broken.