diff --git a/pkgs-ng/fetchurl/builder.sh b/pkgs-ng/build-support/fetchurl/builder.sh
similarity index 100%
rename from pkgs-ng/fetchurl/builder.sh
rename to pkgs-ng/build-support/fetchurl/builder.sh
diff --git a/pkgs-ng/fetchurl/default.fix b/pkgs-ng/build-support/fetchurl/default.fix
similarity index 100%
rename from pkgs-ng/fetchurl/default.fix
rename to pkgs-ng/build-support/fetchurl/default.fix
diff --git a/pkgs-ng/aterm/builder.sh b/pkgs-ng/devel/libs/aterm/builder.sh
similarity index 100%
rename from pkgs-ng/aterm/builder.sh
rename to pkgs-ng/devel/libs/aterm/builder.sh
diff --git a/pkgs-ng/aterm/default.fix b/pkgs-ng/devel/libs/aterm/default.fix
similarity index 100%
rename from pkgs-ng/aterm/default.fix
rename to pkgs-ng/devel/libs/aterm/default.fix
diff --git a/pkgs-ng/stdenv/nix/default.fix b/pkgs-ng/stdenv/nix/default.fix
index cb7768f2407e..43133ffb62e3 100644
--- a/pkgs-ng/stdenv/nix/default.fix
+++ b/pkgs-ng/stdenv/nix/default.fix
@@ -6,8 +6,10 @@
   , initialPath =
       [ pkgs.coreutils
       , pkgs.findutils
+      , pkgs.diffutils
       , pkgs.gnused
       , pkgs.gnugrep
+      , pkgs.gawk
       , pkgs.gnutar
       , pkgs.gzip
       , pkgs.binutils
diff --git a/pkgs-ng/sys-utils/diffutils/builder.sh b/pkgs-ng/sys-utils/diffutils/builder.sh
new file mode 100755
index 000000000000..408b75eb8037
--- /dev/null
+++ b/pkgs-ng/sys-utils/diffutils/builder.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd diffutils-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
diff --git a/pkgs-ng/sys-utils/diffutils/default.fix b/pkgs-ng/sys-utils/diffutils/default.fix
new file mode 100644
index 000000000000..c92e4c4d9027
--- /dev/null
+++ b/pkgs-ng/sys-utils/diffutils/default.fix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation
+  { name = "diffutils-2.8.1"
+  , system = stdenv.system
+  , builder = ./builder.sh
+  , src = fetchurl
+      { url = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz
+      , md5 = "71f9c5ae19b60608f6c7f162da86a428"
+      }
+  , stdenv = stdenv
+  }
diff --git a/pkgs-ng/sys-utils/gawk/builder.sh b/pkgs-ng/sys-utils/gawk/builder.sh
new file mode 100755
index 000000000000..f1a951f1fd5c
--- /dev/null
+++ b/pkgs-ng/sys-utils/gawk/builder.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd gawk-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
diff --git a/pkgs-ng/sys-utils/gawk/default.fix b/pkgs-ng/sys-utils/gawk/default.fix
new file mode 100644
index 000000000000..235300cc1a79
--- /dev/null
+++ b/pkgs-ng/sys-utils/gawk/default.fix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation
+  { name = "gawk-3.1.3"
+  , system = stdenv.system
+  , builder = ./builder.sh
+  , src = fetchurl
+      { url = ftp://ftp.nluug.nl/pub/gnu/gawk/gawk-3.1.3.tar.bz2
+      , md5 = "a116eec17e7ba085febb74c7758823bd"
+      }
+  , stdenv = stdenv
+  }
diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs-ng/system/all-packages-generic.fix
index 7b013c6c684c..d26641654e59 100644
--- a/pkgs-ng/system/all-packages-generic.fix
+++ b/pkgs-ng/system/all-packages-generic.fix
@@ -3,7 +3,7 @@
 # packages provided by the Nix Package Collection.
 
 {system, stdenv}: rec
-  { fetchurl = (import ../fetchurl)
+  { fetchurl = (import ../build-support/fetchurl)
       { stdenv = stdenv
       }
 
@@ -19,6 +19,12 @@
       , stdenv = stdenv
       }
 
+  # sys-utils/diffutils
+  , diffutils = (import ../sys-utils/diffutils)
+      { fetchurl = fetchurl
+      , stdenv = stdenv
+      }
+
   # sys-utils/gnused
   , gnused = (import ../sys-utils/gnused)
       { fetchurl = fetchurl
@@ -32,6 +38,12 @@
       , pcre = pcre
       }
 
+  # sys-utils/gawk
+  , gawk = (import ../sys-utils/gawk)
+      { fetchurl = fetchurl
+      , stdenv = stdenv
+      }
+
   # archivers/gnutar
   , gnutar = (import ../archivers/gnutar)
       { fetchurl = fetchurl
@@ -75,7 +87,8 @@
       , stdenv = stdenv
       }
 
-  , aterm = (import ../aterm)
+  # devel/libs/aterm
+  , aterm = (import ../devel/libs/aterm)
       { fetchurl = fetchurl
       , stdenv = stdenv
       }