diff --git a/pkgs/os-specific/linux/kernel-headers-arm/builder.sh b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh
similarity index 52%
rename from pkgs/os-specific/linux/kernel-headers-arm/builder.sh
rename to pkgs/os-specific/linux/kernel-headers-cross/builder.sh
index fa91ae105916..f78c959ae033 100644
--- a/pkgs/os-specific/linux/kernel-headers-arm/builder.sh
+++ b/pkgs/os-specific/linux/kernel-headers-cross/builder.sh
@@ -13,8 +13,14 @@ installPhase() {
     mkdir $out/include
     #cd $out/include
     #ln -s asm-arm asm
-    make include/asm ARCH=arm
-    cp -prvd include/linux include/asm include/asm-arm include/asm-generic $out/include
+    if test $cross = "arm-linux"; then
+       arch=arm
+    else if test $cross = "mips-linux"; then
+           arch=mips
+         fi
+    fi
+    make include/asm ARCH=$arch
+    cp -prvd include/linux include/asm include/asm-$arch include/asm-generic $out/include
     echo -n > $out/include/linux/autoconf.h
 }
 
diff --git a/pkgs/os-specific/linux/kernel-headers-arm/default.nix b/pkgs/os-specific/linux/kernel-headers-cross/default.nix
similarity index 75%
rename from pkgs/os-specific/linux/kernel-headers-arm/default.nix
rename to pkgs/os-specific/linux/kernel-headers-cross/default.nix
index 7900d5e7ef49..d9157a9b0322 100644
--- a/pkgs/os-specific/linux/kernel-headers-arm/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers-cross/default.nix
@@ -1,12 +1,13 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, cross}:
 
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.13.4-arm";
+  name = "linux-headers-2.6.13.4";
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.4.tar.bz2;
     md5 = "94768d7eef90a9d8174639b2a7d3f58d";
   };
+  inherit cross;
 }