diff --git a/pkgs/development/tools/misc/binutils-arm/builder.sh b/pkgs/development/tools/misc/binutils-cross/builder.sh
similarity index 100%
rename from pkgs/development/tools/misc/binutils-arm/builder.sh
rename to pkgs/development/tools/misc/binutils-cross/builder.sh
diff --git a/pkgs/development/tools/misc/binutils-arm/default.nix b/pkgs/development/tools/misc/binutils-cross/default.nix
similarity index 51%
rename from pkgs/development/tools/misc/binutils-arm/default.nix
rename to pkgs/development/tools/misc/binutils-cross/default.nix
index 580e87e5ac2..ae758611fff 100644
--- a/pkgs/development/tools/misc/binutils-arm/default.nix
+++ b/pkgs/development/tools/misc/binutils-cross/default.nix
@@ -1,12 +1,12 @@
-{stdenv, fetchurl, noSysDirs}:
+{stdenv, fetchurl, noSysDirs, cross}:
 
 stdenv.mkDerivation {
-  name = "binutils-2.16.1-arm";
+  name = "binutils-2.16.1";
   builder = ./builder.sh;
   src = fetchurl {
     url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
     md5 = "6a9d529efb285071dad10e1f3d2b2967";
   };
   inherit noSysDirs;
-  configureFlags = "--target=arm-linux";
+  configureFlags = if cross=="arm-linux" then "--target=arm-linux" else if cross=="mips-linux" then "--target=mips-linux" else "";
 }
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index ef827c11888..644dd428a82 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -322,8 +322,14 @@ rec {
     inherit fetchurl stdenv noSysDirs;
   };
 
-  binutilsArm = (import ../development/tools/misc/binutils-arm) {
+  binutilsMips = (import ../development/tools/misc/binutils-cross) {
     inherit fetchurl stdenv noSysDirs;
+    cross = "mips-linux";
+  };
+
+  binutilsArm = (import ../development/tools/misc/binutils-cross) {
+    inherit fetchurl stdenv noSysDirs;
+    cross = "arm-linux";
   };
 
   patchelf = (import ../development/tools/misc/patchelf) {
@@ -492,7 +498,9 @@ rec {
       langF77 = false;
       langCC = false;
     };
-    inherit (stdenv.gcc) binutils glibc;
+    #inherit (stdenv.gcc) binutils glibc;
+    inherit (stdenv.gcc) glibc;
+    binutils = binutilsArm;
     inherit stdenv;
   };
   gcc40 = (import ../build-support/gcc-wrapper) {
@@ -1424,6 +1432,13 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  #dietlibcArm = (import ../os-specific/linux/dietlibc-cross) {
+  #  inherit fetchurl stdenv;
+  #  gccCross = gcc40arm;
+  #  binutilsCross = binutilsArm;
+  #  arch = "arm";
+  #};
+
   dietlibcWrapper = (import ../os-specific/linux/dietlibc-wrapper) {
     inherit stdenv dietlibc;
     gcc = stdenv.gcc;