diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index eeb76df6221..ac3f49035a1 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, unzip}:
 
-assert stdenv.system == "armv5tel-linux";
+# assert stdenv.system == "armv5tel-linux";
 
 # All this file is made for the Marvell Sheevaplug
    
@@ -34,7 +34,11 @@ stdenv.mkDerivation {
 
   buildPhase = ''
     unset src
-    make clean all
+    if test -z "$crossTarget"; then
+        make clean all
+    else
+        make clean all ARCH=arm CROSS_COMPILE=$crossTarget-
+    fi
   '';
 
   buildInputs = [ unzip ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a084e206b9..60c39c31bfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6096,10 +6096,14 @@ let
     inherit (xlibs) libX11 xproto;
   };*/
 
-  uboot = import ../misc/uboot {
+  uboot = makeOverridable (import ../misc/uboot) {
     inherit fetchurl stdenv unzip;
   };
 
+  ubootArm = uboot.override {
+    stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
+  };
+
   uclibc = import ../os-specific/linux/uclibc {
     inherit fetchurl stdenv kernelHeaders;
   };