diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt
index f4d24d7c0c7d..463d40decb80 100644
--- a/maintainers/docs/todo.txt
+++ b/maintainers/docs/todo.txt
@@ -12,5 +12,3 @@
 * Add gettext to glib propagatedBuildInputs?  Glib's `gi18n.h' doesn't
   seem to like Glibc `libintl.h'; needs the gettext one instead.
   [Move from libbonoboui]
-
-* Use new-style builder for GNU patch.
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index 3dfc5a1132d0..2ae98d17fbd1 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -12,6 +12,7 @@ if test "$noSysDirs" = "1"; then
         # being generated to make sure that they use our glibc.
         if test -e $NIX_GCC/nix-support/orig-glibc; then
             glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
+            
             # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just
             # source in $NIX_GCC/nix-support/add-flags, since that
             # would cause *this* GCC to be linked against the
@@ -32,6 +33,11 @@ if test "$noSysDirs" = "1"; then
             hook=$(pwd)/ld-wrapper-hook
             echo "NIX_GLIBC_FLAGS_SET=1" > $hook
             export NIX_LD_WRAPPER_START_HOOK=$hook
+
+            # Use *real* header files, otherwise a limits.h is
+            # generated that does not include Glibc's limits.h
+            # (notably missing SSIZE_MAX, which breaks the build).
+            export NIX_FIXINC_DUMMY=$glibc/include
         fi
 
         export NIX_EXTRA_CFLAGS=$extraCFlags
diff --git a/pkgs/development/compilers/gcc-3.4/default.nix b/pkgs/development/compilers/gcc-3.4/default.nix
index 6e82c5e983a4..b12112f9008d 100644
--- a/pkgs/development/compilers/gcc-3.4/default.nix
+++ b/pkgs/development/compilers/gcc-3.4/default.nix
@@ -6,11 +6,11 @@
 assert langC;
 
 stdenv.mkDerivation {
-  name = "gcc-3.4.4";
+  name = "gcc-3.4.5";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/gcc/gcc-3.4.4/gcc-3.4.4.tar.bz2;
-    md5 = "b594ff4ea4fbef4ba9220887de713dfe";
+    url = http://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.5/gcc-3.4.5.tar.bz2;
+    md5 = "7c3c3c3e764dcee5eb771432062d69e1";
   };
   # !!! apply only if noSysDirs is set
   patches = [./no-sys-dirs.patch];
diff --git a/pkgs/development/libraries/audiofile/builder.sh b/pkgs/development/libraries/audiofile/builder.sh
deleted file mode 100644
index b3b3f83bb424..000000000000
--- a/pkgs/development/libraries/audiofile/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-buildinputs=""
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd audiofile-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index cf41fe6c9aa2..f0156d45e3b3 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation {
   name = "audiofile-0.2.3";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/audiofile-0.2.5.tar.gz;
     md5 = "fd07c62a17ceafa317929e55e51e26c5";
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 57bb7b9efcd9..cec777acbb30 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl, kernelHeaders, installLocales ? true}:
 
 stdenv.mkDerivation {
-  name = "glibc-2.3.5";
+  name = "glibc-2.3.6";
   builder = ./builder.sh;
   substitute = ../../../build-support/substitute/substitute.sh;
 
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/glibc/glibc-2.3.5.tar.bz2;
-    md5 = "93d9c51850e0513aa4846ac0ddcef639";
+    url = http://ftp.gnu.org/pub/gnu/glibc/glibc-2.3.6.tar.bz2;
+    md5 = "bfdce99f82d6dbcb64b7f11c05d6bc96";
   };
 
   linuxthreadsSrc = fetchurl {
-    url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.3.5.tar.bz2;
-    md5 = "77011b0898393c56b799bc011a0f37bf";
+    url = http://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-2.3.6.tar.bz2;
+    md5 = "d4eeda37472666a15cc1f407e9c987a9";
   };
 
   patches = [ ./glibc-pwd.patch ];
diff --git a/pkgs/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh
index 1004d279a511..0ec9de37d76e 100644
--- a/pkgs/development/libraries/openssl/builder.sh
+++ b/pkgs/development/libraries/openssl/builder.sh
@@ -6,7 +6,7 @@ configureFlags=shared
 postInstall=postInstall
 postInstall() {
     # Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
-    chmod 755 $out/lib/pkgconfig || exit 1
+    chmod 755 $out/lib/pkgconfig
 }
 
 genericBuild
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 5012ec5b9689..4ea4e151d202 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, perl}: stdenv.mkDerivation {
-  name = "openssl-0.9.7g";
+  name = "openssl-0.9.7i";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.openssl.org/source/openssl-0.9.7h.tar.gz;
-    sha1 = "9fe535fce89af967b29c4727dedd25f2b4cc2f0d";
+    url = http://www.openssl.org/source/openssl-0.9.7i.tar.gz;
+    sha1 = "f69d82b206ff8bff9d0e721f97380b9e";
   };
   buildInputs = [perl];
   patches = [./darwin-makefile.patch];
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 9eb88545768b..1b3a7ed104b4 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "pcre-6.0";
+  name = "pcre-6.4";
   src = fetchurl {
-    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.0.tar.bz2;
-    md5 = "9352eb6d2be5ad9d8360d2377d3cafac";
+    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-6.4.tar.bz2;
+    md5 = "c5c73e8767479e8a7751324b0aa32291";
   };
 }
diff --git a/pkgs/development/libraries/popt/builder.sh b/pkgs/development/libraries/popt/builder.sh
deleted file mode 100644
index 67696b464675..000000000000
--- a/pkgs/development/libraries/popt/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-buildinputs="$gettext"
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd popt-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
-strip -S $out/lib/*.a || exit 1
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index e8d23dbe188b..1170760c828b 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -4,10 +4,9 @@ assert gettext != null;
 
 stdenv.mkDerivation {
   name = "popt-1.7";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/popt-1.7.tar.gz;
     md5 = "5988e7aeb0ae4dac8d83561265984cc9";
   };
-  gettext = gettext;
+  buildInputs = [gettext];
 }
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index aa4a076689d2..934848ef64f6 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -3,10 +3,10 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.13.4-i386";
+  name = "linux-headers-2.6.14.3-i386";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.4.tar.bz2;
-    md5 = "94768d7eef90a9d8174639b2a7d3f58d";
+    url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.3.tar.bz2;
+    md5 = "982717a9cb246e3c427cc45e3fc86097";
   };
 }
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 17053aa3126d..02617ed51dd2 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "coreutils-5.2.1";
+  name = "coreutils-5.93";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.2.1.tar.bz2;
-    md5 = "172ee3c315af93d3385ddfbeb843c53f";
+    url = http://ftp.gnu.org/pub/gnu/coreutils/coreutils-5.93.tar.bz2;
+    md5 = "955d8abfd3dd8af2ca3af51480f1f9af";
   };
 }
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 7a6b68594b68..c1bbd78af1b1 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, coreutils}:
 
 stdenv.mkDerivation {
-  name = "findutils-4.2.25";
+  name = "findutils-4.2.26";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/findutils/findutils-4.2.25.tar.gz;
-    md5 = "e92fef6714ffa9972f28a1a423066921";
+    url = http://ftp.gnu.org/pub/gnu/findutils/findutils-4.2.26.tar.gz;
+    md5 = "9ac4e62937b1fdc4eb643d1d4bf117d3";
   };
   buildInputs = [coreutils];
   patches = [./findutils-path.patch];
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 01a78e08d104..535591ab36eb 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -3,10 +3,10 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
-  name = "curl-7.14.0";
+  name = "curl-7.15.0";
   src = fetchurl {
-    url = http://curl.haxx.se/download/curl-7.14.0.tar.bz2;
-    md5 = "46ce665e47d37fce1a0bad935cce58a9";
+    url = http://curl.haxx.se/download/curl-7.15.0.tar.bz2;
+    md5 = "e3b130320d3704af375c097606f49c01";
   };
   buildInputs = [zlib (if sslSupport then openssl else null)];
   patches = [./configure-cxxcpp.patch];
diff --git a/pkgs/tools/networking/par2cmdline/builder.sh b/pkgs/tools/networking/par2cmdline/builder.sh
deleted file mode 100644
index 69fe4da4b4bc..000000000000
--- a/pkgs/tools/networking/par2cmdline/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd par2cmdline-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index 3c1aa03c105b..dd613415c219 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -1,8 +1,7 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "par2cmdline-0.3";
-  builder = ./builder.sh;
+  name = "par2cmdline-0.4";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/par2cmdline-0.3.tar.gz;
-    md5 = "705c97bc41b862d281dd41c219a60849";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/parchive/par2cmdline-0.4.tar.gz;
+    md5 = "1551b63e57e3c232254dc62073b723a9";
   };
 }
diff --git a/pkgs/tools/system/which/builder.sh b/pkgs/tools/system/which/builder.sh
deleted file mode 100644
index e5ef90829fbb..000000000000
--- a/pkgs/tools/system/which/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd which-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index 915354ea21de..6e938e450091 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "which-2.16";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/which-2.16.tar.gz;
     md5 = "830b83af48347a9a3520f561e47cbc9b";
diff --git a/pkgs/tools/text/ed/builder.sh b/pkgs/tools/text/ed/builder.sh
deleted file mode 100644
index 0e82ef42ccc7..000000000000
--- a/pkgs/tools/text/ed/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd ed-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/tools/text/ed/default.nix b/pkgs/tools/text/ed/default.nix
index 2c8ba7ef6f6e..dce99f3ba013 100644
--- a/pkgs/tools/text/ed/default.nix
+++ b/pkgs/tools/text/ed/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "ed-0.2";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/ed-0.2.tar.gz;
     md5 = "ddd57463774cae9b50e70cd51221281b";
diff --git a/pkgs/tools/text/gnupatch/builder.sh b/pkgs/tools/text/gnupatch/builder.sh
deleted file mode 100644
index 35eaebe56c70..000000000000
--- a/pkgs/tools/text/gnupatch/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd patch-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index ae798ce71289..c019be07a7b2 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -1,6 +1,5 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
   name = "gnupatch-2.5.4";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";