diff --git a/pkgs/development/compilers/strategoxt/builder.sh b/pkgs/development/compilers/strategoxt/builder.sh
index 5311bc98b97b..13f29624239e 100755
--- a/pkgs/development/compilers/strategoxt/builder.sh
+++ b/pkgs/development/compilers/strategoxt/builder.sh
@@ -4,7 +4,7 @@ buildinputs="$aterm $sdf"
 . $stdenv/setup || exit 1
 
 tar zxf $src || exit 1
-cd strategoxt-* || exit 1
+cd $dir* || exit 1
 ./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf || exit 1
 make || exit 1
 make install || exit 1
diff --git a/pkgs/development/compilers/strategoxt/default.nix b/pkgs/development/compilers/strategoxt/default.nix
index f2087084ca06..aa655a2c3348 100644
--- a/pkgs/development/compilers/strategoxt/default.nix
+++ b/pkgs/development/compilers/strategoxt/default.nix
@@ -3,10 +3,12 @@
   system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://losser.st-lab.cs.uu.nl/~mbravenb/dailydist/strategoxt/src/strategoxt-0.9.4-4626.tar.gz;
+    url = http://losser.labs.cs.uu.nl/~mbravenb/dailydist/strategoxt/src/strategoxt-0.9.4-4626.tar.gz;
     md5 = "f33ae9fdb9d8628ae01fa0f26bfa0429"
   };
   stdenv = stdenv;
   aterm = aterm;
   sdf = sdf;
+  tarfile = "true";
+  dir = "strategoxt";
 }
diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix
index ed26488fca77..a2394a908678 100644
--- a/pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix
+++ b/pkgs/development/compilers/strategoxt/strategoxt-0.9.3.nix
@@ -9,4 +9,6 @@
   stdenv = stdenv;
   aterm = aterm;
   sdf = sdf;
+  tarfile = "true";
+  dir = "strategoxt";
 }
diff --git a/pkgs/development/compilers/strategoxt/svnbuilder.sh b/pkgs/development/compilers/strategoxt/svnbuilder.sh
new file mode 100755
index 000000000000..bed37b987f23
--- /dev/null
+++ b/pkgs/development/compilers/strategoxt/svnbuilder.sh
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+buildinputs="$aterm $sdf $make $automake $autoconf $libtool $which"
+. $stdenv/setup || exit 1
+
+echo "pwd = `pwd`"
+echo "PATH = $PATH"
+
+cp -r $src strategoxt || exit 1
+chmod -R +w strategoxt
+cd strategoxt || exit 1
+./bootstrap || exit 1
+./configure --prefix=$out --with-aterm=$aterm --with-sdf=$sdf || exit 1
+make install || exit 1
diff --git a/pkgs/development/compilers/strategoxt/trunk.nix b/pkgs/development/compilers/strategoxt/trunk.nix
new file mode 100644
index 000000000000..8aafb622218d
--- /dev/null
+++ b/pkgs/development/compilers/strategoxt/trunk.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchsvn, autotools, which, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.4-4785";
+  system = stdenv.system;
+  builder = ./svnbuilder.sh;
+  src = fetchsvn {
+    url = https://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/StrategoXT;
+    rev = "4785";
+  };
+  stdenv = stdenv;
+
+  make     = autotools.make;
+  automake = autotools.automake;
+  autoconf = autotools.autoconf;
+  libtool  = autotools.libtool;
+  which    = which;
+
+  aterm = aterm;
+  sdf = sdf;
+}
diff --git a/pkgs/development/tools/misc/libtool/builder.sh b/pkgs/development/tools/misc/libtool/builder.sh
new file mode 100755
index 000000000000..eaa673874ae5
--- /dev/null
+++ b/pkgs/development/tools/misc/libtool/builder.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$m4 $perl"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd libtool-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix
new file mode 100644
index 000000000000..d9f13f11763e
--- /dev/null
+++ b/pkgs/development/tools/misc/libtool/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, m4, perl}:
+derivation {
+  name = "autoconf-2.58";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz;
+    md5 = "0e1844f25e2ad74c3715b5776d017545";
+  };
+  stdenv = stdenv;
+  m4 = m4;
+  perl = perl;
+}
diff --git a/pkgs/development/tools/misc/libtool/default.nix~ b/pkgs/development/tools/misc/libtool/default.nix~
new file mode 100644
index 000000000000..64dfd2aa53eb
--- /dev/null
+++ b/pkgs/development/tools/misc/libtool/default.nix~
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, m4, perl}:
+derivation {
+  name = "autoconf-2.58";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ;
+    md5 = "";
+  };
+  stdenv = stdenv;
+  m4 = m4;
+  perl = perl;
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 71eec996f289..855893cb2d0d 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -88,6 +88,11 @@
     stdenv = stdenv;
   };
 
+  which = (import ../tools/system/which) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+  };
+
   wget = (import ../tools/networking/wget) {
     fetchurl = fetchurl;
     stdenv = stdenv;
@@ -142,6 +147,20 @@
     autoconf = autoconf;
   };
 
+  libtool = (import ../development/tools/misc/libtool) {
+    fetchurl = fetchurl;
+    stdenv = stdenv;
+    m4 = gnum4;
+    perl = perl;
+  };
+
+  autotools = {
+    automake = automake;
+    autoconf = autoconf;
+    make     = gnumake;
+    libtool  = libtool;
+  };
+
   pkgconfig = (import ../development/tools/misc/pkgconfig) {
     fetchurl = fetchurl;
     stdenv = stdenv;
@@ -219,6 +238,15 @@
     sdf = sdf2;
   };
 
+  strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
+    fetchsvn = fetchsvn;
+    stdenv = stdenv;
+    autotools = autotools;
+    which = which;
+    aterm = aterm;
+    sdf = sdf2;
+  };
+
   strategoxt093 = (import ../development/compilers/strategoxt/strategoxt-0.9.3.nix) {
     fetchurl = fetchurl;
     stdenv = stdenv;
diff --git a/pkgs/tools/system/which/builder.sh b/pkgs/tools/system/which/builder.sh
new file mode 100755
index 000000000000..e6ddd3dfa738
--- /dev/null
+++ b/pkgs/tools/system/which/builder.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $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/builder.sh~ b/pkgs/tools/system/which/builder.sh~
new file mode 100755
index 000000000000..126635327925
--- /dev/null
+++ b/pkgs/tools/system/which/builder.sh~
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd sed-* || 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
new file mode 100644
index 000000000000..8d85e4120fc0
--- /dev/null
+++ b/pkgs/tools/system/which/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl}: derivation {
+  name = "which-2.16";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.gnu.org/gnu/which/which-2.16.tar.gz;
+    md5 = "830b83af48347a9a3520f561e47cbc9b";
+  };
+  stdenv = stdenv;
+}
+
+
+