diff --git a/pkgs/stdenv/linux/bash-static/builder.sh b/pkgs/stdenv/linux/bash-static/builder.sh
deleted file mode 100644
index 542594297f8..00000000000
--- a/pkgs/stdenv/linux/bash-static/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. $stdenv/setup
- 
-mkdir $out
-cp -a $src $out
diff --git a/pkgs/stdenv/linux/bash-static/default.nix b/pkgs/stdenv/linux/bash-static/default.nix
deleted file mode 100644
index 55c9b2faa0e..00000000000
--- a/pkgs/stdenv/linux/bash-static/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv}:
- 
-stdenv.mkDerivation {
-  name = "bash-static-2.05b";
-  builder = ./builder.sh;
-  src = ./bash;
-}
diff --git a/pkgs/stdenv/linux/binutils-static/builder.sh b/pkgs/stdenv/linux/binutils-static/builder.sh
deleted file mode 100644
index ede1a5d2258..00000000000
--- a/pkgs/stdenv/linux/binutils-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a binutils-2.15/* $out
diff --git a/pkgs/stdenv/linux/binutils-static/default.nix b/pkgs/stdenv/linux/binutils-static/default.nix
deleted file mode 100644
index 58607b8da8b..00000000000
--- a/pkgs/stdenv/linux/binutils-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit gnutar gzip curl;
-  name = "binutils-static-2.15";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/binutils-2.15-static.tar.gz;
-  tarball = "binutils-2.15-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/bzip2-static/builder.sh b/pkgs/stdenv/linux/bzip2-static/builder.sh
deleted file mode 100644
index 1bdc2634896..00000000000
--- a/pkgs/stdenv/linux/bzip2-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
-
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a bzip2-1.0.2/* $out
diff --git a/pkgs/stdenv/linux/bzip2-static/default.nix b/pkgs/stdenv/linux/bzip2-static/default.nix
deleted file mode 100644
index 631850ca1ee..00000000000
--- a/pkgs/stdenv/linux/bzip2-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit gnutar gzip curl;
-  name = "bzip2-static-1.0.2";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/bzip2-1.0.2-static.tar.gz;
-  tarball = "bzip2-1.0.2-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/coreutils-static/builder.sh b/pkgs/stdenv/linux/coreutils-static/builder.sh
deleted file mode 100644
index 80ba81d451e..00000000000
--- a/pkgs/stdenv/linux/coreutils-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a coreutils-5.0/* $out
diff --git a/pkgs/stdenv/linux/coreutils-static/default.nix b/pkgs/stdenv/linux/coreutils-static/default.nix
deleted file mode 100644
index 89cf504353c..00000000000
--- a/pkgs/stdenv/linux/coreutils-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit curl gzip gnutar;
-  name = "coreutils-static-5.0";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/coreutils-5.0-static.tar.gz;
-  tarball = "coreutils-5.0-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/curl-static/builder.sh b/pkgs/stdenv/linux/curl-static/builder.sh
deleted file mode 100644
index 213b82e1e29..00000000000
--- a/pkgs/stdenv/linux/curl-static/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-. $stdenv/setup
- 
-tar zxvf $src
-mkdir $out
-cp -a curl-7.12.2/* $out
diff --git a/pkgs/stdenv/linux/curl-static/default.nix b/pkgs/stdenv/linux/curl-static/default.nix
deleted file mode 100644
index b61ce46bb97..00000000000
--- a/pkgs/stdenv/linux/curl-static/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv}:
- 
-stdenv.mkDerivation {
-  name = "curl-static-7.12.2";
-  builder = ./builder.sh;
-  src = ./curl-7.12.2-static.tar.gz;
-}
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index f412252d3c4..4b3790664c2 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -21,7 +21,7 @@ rec {
     tar = ./tools/tar;
     bunzip2 = ./tools/bunzip2;
     cp = ./tools/cp;
-    curl = ./curl-static/curl-7.12.2-static.tar.bz2;
+    curl = ./tools/curl-7.12.2-static.tar.bz2;
     system = "i686-linux";
     args = [ ./scripts/unpack-curl.sh ];
   };
diff --git a/pkgs/stdenv/linux/diffutils-static/builder.sh b/pkgs/stdenv/linux/diffutils-static/builder.sh
deleted file mode 100644
index 603cc8ab7ad..00000000000
--- a/pkgs/stdenv/linux/diffutils-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a diffutils-2.8.1/* $out
diff --git a/pkgs/stdenv/linux/diffutils-static/default.nix b/pkgs/stdenv/linux/diffutils-static/default.nix
deleted file mode 100644
index 786dd873303..00000000000
--- a/pkgs/stdenv/linux/diffutils-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit curl gzip gnutar;
-  name = "diffutils-static-2.8.1";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/diffutils-2.8.1-static.tar.gz;
-  tarball = "diffutils-2.8.1-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/findutils-static/builder.sh b/pkgs/stdenv/linux/findutils-static/builder.sh
deleted file mode 100644
index 9d5ac179ed1..00000000000
--- a/pkgs/stdenv/linux/findutils-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a findutils-4.1.20/* $out
diff --git a/pkgs/stdenv/linux/findutils-static/default.nix b/pkgs/stdenv/linux/findutils-static/default.nix
deleted file mode 100644
index 98b4691503e..00000000000
--- a/pkgs/stdenv/linux/findutils-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit curl gzip gnutar;
-  name = "findutils-static-4.1.20";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/findutils-4.1.20-static.tar.gz;
-  tarball = "findutils-4.1.20-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/gawk-static/builder.sh b/pkgs/stdenv/linux/gawk-static/builder.sh
deleted file mode 100644
index 8d55abd587d..00000000000
--- a/pkgs/stdenv/linux/gawk-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a gawk-3.1.3/* $out
diff --git a/pkgs/stdenv/linux/gawk-static/default.nix b/pkgs/stdenv/linux/gawk-static/default.nix
deleted file mode 100644
index e85111dbc44..00000000000
--- a/pkgs/stdenv/linux/gawk-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit curl gzip gnutar;
-  name = "gawk-static-3.1.3";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/gawk-3.1.3-static.tar.gz;
-  tarball = "gawk-3.1.3-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/gcc-static/builder.sh b/pkgs/stdenv/linux/gcc-static/builder.sh
deleted file mode 100644
index 982d7254106..00000000000
--- a/pkgs/stdenv/linux/gcc-static/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-. $stdenv/setup
- 
-tar zxvf $src
-mkdir $out
-cp -a gcc-3.3.4/* $out
diff --git a/pkgs/stdenv/linux/gcc-static/default.nix b/pkgs/stdenv/linux/gcc-static/default.nix
deleted file mode 100644
index b930807c209..00000000000
--- a/pkgs/stdenv/linux/gcc-static/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv}:
- 
-stdenv.mkDerivation {
-  name = "gcc-static-3.3.4";
-  builder = ./builder.sh;
-  src = ./gcc-3.3.4-static.tar.gz;
-  langC = true;
-  langCC = false;
-  langF77 = false;
-}
diff --git a/pkgs/stdenv/linux/gnugrep-static/builder.sh b/pkgs/stdenv/linux/gnugrep-static/builder.sh
deleted file mode 100644
index 8290f078df3..00000000000
--- a/pkgs/stdenv/linux/gnugrep-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a grep-2.5.1/* $out
diff --git a/pkgs/stdenv/linux/gnugrep-static/default.nix b/pkgs/stdenv/linux/gnugrep-static/default.nix
deleted file mode 100644
index e2c047ee3cc..00000000000
--- a/pkgs/stdenv/linux/gnugrep-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit curl gzip gnutar;
-  name = "gnugrep-static-2.5.1";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/grep-2.5.1-static.tar.gz;
-  tarball = "grep-2.5.1-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/gnumake-static/builder.sh b/pkgs/stdenv/linux/gnumake-static/builder.sh
deleted file mode 100644
index a0e79c73065..00000000000
--- a/pkgs/stdenv/linux/gnumake-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a make-3.80/* $out
diff --git a/pkgs/stdenv/linux/gnumake-static/default.nix b/pkgs/stdenv/linux/gnumake-static/default.nix
deleted file mode 100644
index f1df6b2074b..00000000000
--- a/pkgs/stdenv/linux/gnumake-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit curl gzip gnutar;
-  name = "gnumake-static-3.80";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/make-3.80-static.tar.gz;
-  tarball = "make-3.80-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/gnused-static/builder.sh b/pkgs/stdenv/linux/gnused-static/builder.sh
deleted file mode 100644
index b32cafc8a0e..00000000000
--- a/pkgs/stdenv/linux/gnused-static/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-. $stdenv/setup
-
-PATH=$gzip:$PATH
- 
-$curl/bin/curl $src > $tarball
-$tar/bin/tar zxvf $tarball
-mkdir $out
-cp -a sed-4.0.7/* $out
diff --git a/pkgs/stdenv/linux/gnused-static/default.nix b/pkgs/stdenv/linux/gnused-static/default.nix
deleted file mode 100644
index e22a28efdfe..00000000000
--- a/pkgs/stdenv/linux/gnused-static/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{stdenv, gnutar, gzip, curl}:
- 
-stdenv.mkDerivation {
-  inherit curl gzip gnutar;
-  name = "gnused-static-4.0.7";
-  builder = ./builder.sh;
-  src = http://losser.st-lab.cs.uu.nl/~armijn/.nix/sed-4.0.7-static.tar.gz;
-  tarball = "sed-4.0.7-static.tar.gz";
-}
diff --git a/pkgs/stdenv/linux/gnutar-static/builder.sh b/pkgs/stdenv/linux/gnutar-static/builder.sh
deleted file mode 100644
index 42f0d6e1610..00000000000
--- a/pkgs/stdenv/linux/gnutar-static/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. $stdenv/setup
- 
-mkdir $out
-cp -a $src/* $out
diff --git a/pkgs/stdenv/linux/gnutar-static/default.nix b/pkgs/stdenv/linux/gnutar-static/default.nix
deleted file mode 100644
index 539fd73ffa4..00000000000
--- a/pkgs/stdenv/linux/gnutar-static/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv}:
- 
-stdenv.mkDerivation {
-  name = "gnutar-static-1.13.25";
-  builder = ./builder.sh;
-  src = ./bin;
-}
diff --git a/pkgs/stdenv/linux/gzip-static/bin/gzip b/pkgs/stdenv/linux/gzip-static/bin/gzip
deleted file mode 100755
index c6059153306..00000000000
Binary files a/pkgs/stdenv/linux/gzip-static/bin/gzip and /dev/null differ
diff --git a/pkgs/stdenv/linux/gzip-static/builder.sh b/pkgs/stdenv/linux/gzip-static/builder.sh
deleted file mode 100644
index 42f0d6e1610..00000000000
--- a/pkgs/stdenv/linux/gzip-static/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. $stdenv/setup
- 
-mkdir $out
-cp -a $src/* $out
diff --git a/pkgs/stdenv/linux/gzip-static/default.nix b/pkgs/stdenv/linux/gzip-static/default.nix
deleted file mode 100644
index 68824c56110..00000000000
--- a/pkgs/stdenv/linux/gzip-static/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{stdenv}:
- 
-stdenv.mkDerivation {
-  name = "gzip-static-1.3.3";
-  builder = ./builder.sh;
-  src = ./bin;
-}
diff --git a/pkgs/stdenv/linux/patchelf-static/bin/patchelf b/pkgs/stdenv/linux/patchelf-static/bin/patchelf
deleted file mode 100755
index d0ac6a22f61..00000000000
Binary files a/pkgs/stdenv/linux/patchelf-static/bin/patchelf and /dev/null differ
diff --git a/pkgs/stdenv/linux/curl-static/curl-7.12.2-static.tar.bz2 b/pkgs/stdenv/linux/tools/curl-7.12.2-static.tar.bz2
similarity index 100%
rename from pkgs/stdenv/linux/curl-static/curl-7.12.2-static.tar.bz2
rename to pkgs/stdenv/linux/tools/curl-7.12.2-static.tar.bz2