diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 8dce40b08a7..32f287cdc4c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -8,9 +8,9 @@ let
 
   sheevaplugCrossSystem = {
     crossSystem = rec {
-      config = "armv5tel-unknown-linux-gnueabi";
+      config = "arm-linux-gnueabi";
       bigEndian = false;
-      arch = "arm";
+      arch = "armv5te";
       float = "soft";
       withTLS = true;
       libc = "glibc";
@@ -21,9 +21,9 @@ let
 
   raspberrypiCrossSystem = {
     crossSystem = rec {
-      config = "armv6l-unknown-linux-gnueabi";
+      config = "arm-linux-gnueabihf";
       bigEndian = false;
-      arch = "arm";
+      arch = "armv6";
       float = "hard";
       fpu = "vfp";
       withTLS = true;
@@ -36,9 +36,9 @@ let
 
   armv7l-hf-multiplatform-crossSystem = {
     crossSystem = rec {
-      config = "armv7l-unknown-linux-gnueabi";
+      config = "arm-linux-gnueabihf";
       bigEndian = false;
-      arch = "arm";
+      arch = "armv7-a";
       float = "hard";
       fpu = "vfpv3-d16";
       withTLS = true;
diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 0c2056928c3..1be8c7ad264 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -129,6 +129,10 @@ rec {
     # Only for uboot = uboot :
     ubootConfig = "sheevaplug_config";
     kernelDTB = true; # Beyond 3.10
+    gcc = {
+      arch = "armv5te";
+      float = "soft";
+    };
   };
 
   raspberrypi = {