diff --git a/pkgs/development/compilers/gcc-4.1-temp/builder.sh b/pkgs/development/compilers/gcc-4.1/builder.sh
similarity index 100%
rename from pkgs/development/compilers/gcc-4.1-temp/builder.sh
rename to pkgs/development/compilers/gcc-4.1/builder.sh
diff --git a/pkgs/development/compilers/gcc-4.1-temp/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-4.1-temp/default.nix
rename to pkgs/development/compilers/gcc-4.1/default.nix
diff --git a/pkgs/development/compilers/gcc-4.1-temp/no-sys-dirs.patch b/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.1-temp/no-sys-dirs.patch
rename to pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc-4.1-temp/pass-cxxcpp.patch b/pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch
similarity index 100%
rename from pkgs/development/compilers/gcc-4.1-temp/pass-cxxcpp.patch
rename to pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch
diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix
index 37bc758b9313..d48cbc9a5c51 100644
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@@ -6,22 +6,22 @@
   tar = ./tar.bz2;
 
   staticToolsURL = {
-    url = file:///tmp/tarballs/static-tools.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/static-tools.tar.bz2;
     sha1 = "c366d9ee0d969e68311fdb37abc91b46fb13b585";
   };
 
   binutilsURL = {
-    url = file:///tmp/tarballs/binutils.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/binutils.tar.bz2;
     sha1 = "fa77c29ef4f13ddf43bba3f4f020ceafa6604ccc";
   };
 
   gccURL = {
-    url = file:///tmp/tarballs/gcc.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/gcc.tar.bz2;
     sha1 = "ea7171fc2f70880e8a6c2480b3d3fed7409b7a4e";
   };
 
   glibcURL = {
-    url = file:///tmp/tarballs/glibc.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/glibc.tar.bz2;
     sha1 = "728e0a9e66e01cf2815eca8cc638e5ed140a36cd";
   };
 }
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 08b6f61ad383..db7c3d72e114 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -48,7 +48,7 @@ let
       then pkgsDiet.gawk
       else pkgsStatic.gawk;
       
-    gcc = import ../../development/compilers/gcc-4.1-temp {
+    gcc = import ../../development/compilers/gcc-4.1 {
       inherit (pkgs) fetchurl stdenv;
       noSysDirs = true;
       langCC = false;