diff --git a/pkgs/development/tools/documentation/xdoc/builder.sh b/pkgs/development/tools/documentation/xdoc/builder.sh
new file mode 100644
index 00000000000..85855d6d2b8
--- /dev/null
+++ b/pkgs/development/tools/documentation/xdoc/builder.sh
@@ -0,0 +1,5 @@
+. $stdenv/setup
+
+configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen
+ --with-pt-support=$ptsupport --with-asf-library=$asflibrary --with-strategoxt=$strategoxt --with-graphviz=$graphviz --with-svn=$subversion"
+genericBuild
diff --git a/pkgs/development/tools/documentation/xdoc/default.nix b/pkgs/development/tools/documentation/xdoc/default.nix
new file mode 100644
index 00000000000..cc56d7e133e
--- /dev/null
+++ b/pkgs/development/tools/documentation/xdoc/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, strategoxt, aterm, sdf, subversion, graphviz}: 
+
+stdenv.mkDerivation {
+  name = "xdoc-0.1";
+  src = fetchurl {
+    url = http://machina.nl/xdoc/xdoc-0.1.tar.gz;
+    md5 = "6f601254013d5fe3d2fdbd33b827001a";
+  };
+  builder = ./builder.sh;
+  inherit aterm strategoxt subversion graphviz ;
+  inherit (sdf) sglr pgen ptsupport asflibrary;
+  buildInputs = [aterm sdf.pgen strategoxt];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 7282764f622..c74bfdc34ee 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -355,6 +355,12 @@ rec {
     sdf = sdf_22;
   };
 
+  xdoc = (import ../development/tools/documentation/xdoc) {
+    inherit fetchurl stdenv aterm strategoxt subversion graphviz;
+    sdf = sdf_22;
+  };
+
+
   #strategoxtsvn = (import ../development/compilers/strategoxt/trunk.nix) {
   #  inherit fetchsvn stdenv autoconf automake libtool which aterm;
   #  sdf = sdf_22;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index bd85cccadde..74ad4d80cbf 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -33,6 +33,7 @@ let {
     gcc34
     aterm
     strategoxt
+    xdoc
     ghc
     helium
     perl