diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix
new file mode 100644
index 000000000000..8fe7795b0e35
--- /dev/null
+++ b/pkgs/development/compilers/strategoxt/strategoxt-0.16.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, aterm, sdf, pkgconfig}:
+
+stdenv.mkDerivation {
+
+  name = "strategoxt-0.16M2pre13214";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/stratego/strategoxt-0.16M2pre13214/strategoxt-0.16M2pre13214.tar.gz;
+    md5 = "a28b34f3d527e026aab9225a9e4db03a";
+  };
+
+  inherit aterm sdf;
+  buildInputs = [pkgconfig aterm sdf];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 861764f8d7b3..8fe78c2c20de 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -551,6 +551,10 @@ rec {
     };
   };
 
+  strategoxt_unstable = (import ../development/compilers/strategoxt/strategoxt-0.16.nix) {
+    inherit fetchurl pkgconfig stdenv sdf aterm;
+  };
+
   strategoxtUtils = (import ../development/compilers/strategoxt/utils) {
     inherit fetchurl pkgconfig stdenv sdf strategoxt;
 
@@ -560,7 +564,8 @@ rec {
   };
 
   bibtextools = (import ../tools/typesetting/bibtex-tools) {
-    inherit fetchurl stdenv aterm strategoxt tetex hevea sdf;
+    inherit fetchurl stdenv aterm tetex hevea sdf;
+    strategoxt = strategoxt_unstable;
   };
 
   #  xdoc = (import ../development/tools/documentation/xdoc) {
diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix
index e98a96969d4d..df4a5b422491 100644
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, hevea, tetex, strategoxt, aterm, sdf}: 
 
 stdenv.mkDerivation {
-  name = "bibtex-tools-0.1";
+  name = "bibtex-tools-0.2pre13026";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.cs.uu.nl/~visser/ftp/bibtex-tools-0.1.tar.gz;
-    md5 = "8e3ce277100af6fceec23f5bed4aa9e8";
+    url = http://nix.cs.uu.nl/dist/stratego/bibtex-tools-0.2pre13026/bibtex-tools-0.2pre13026.tar.gz;
+    md5 = "2d8a5de7c53eb670307048eb3d14cdd6";
   };
   inherit aterm tetex hevea sdf strategoxt;
   buildInputs = [aterm sdf strategoxt hevea];