diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f8f406a0482..62f63f23e5d 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -472,6 +472,18 @@ rec {
     inherit stdenv;
   };
 
+  gcc40arm = (import ../build-support/gcc-cross-wrapper) {
+    nativeTools = false;
+    nativeGlibc = false;
+    cross = "arm-linux";
+    gcc = (import ../development/compilers/gcc-4.0-arm) {
+      inherit fetchurl stdenv noSysDirs binutilsArm kernelHeadersArm;
+      langF77 = false;
+      langCC = false;
+    };
+    inherit (stdenv.gcc) binutils glibc;
+    inherit stdenv;
+  };
   gcc40 = (import ../build-support/gcc-wrapper) {
     nativeTools = false;
     nativeGlibc = false;
@@ -1342,6 +1354,10 @@ rec {
   
   ### OS-SPECIFIC
 
+  uclibc = (import ../development/uclibc) {
+    inherit fetchurl stdenv gcc40arm kernelHeadersArm binutilsArm;
+  };
+
   dietlibc = (import ../os-specific/linux/dietlibc) {
     inherit fetchurl stdenv;
   };
@@ -1363,6 +1379,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  kernelHeadersArm = (import ../os-specific/linux/kernel-headers-arm) {
+    inherit fetchurl stdenv;
+  };
+
   kernel = (import ../os-specific/linux/kernel) {
     inherit fetchurl stdenv perl;
   };