diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix
index 02ac7f381e5..648f0a9cd17 100644
--- a/pkgs/development/ocaml-modules/tyxml/default.nix
+++ b/pkgs/development/ocaml-modules/tyxml/default.nix
@@ -1,29 +1,24 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}:
+{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}:
 
 stdenv.mkDerivation {
-  name = "tyxml-3.0.0";
+  name = "tyxml-3.1.1";
 
   src = fetchurl {
-    url = http://ocsigen.org/download/tyxml-3.0.0.tar.gz;
-    sha256 = "0cvbmyg4g0lg4f23032cjlxqklisccbjgj47117wm6gva8xi7xa3";
+    url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz;
+    sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z";
     };
 
-  buildInputs = [ocaml findlib ocaml_oasis];
+  buildInputs = [ocaml findlib ocaml_oasis camlp4];
 
   createFindlibDestdir = true;
 
-  configurePhase = ''
-  make setup-dev.exe
-  ./setup-dev.exe -configure --prefix $out
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://ocsigen.org/tyxml/;
     description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing";
-    license = "LGPL";
+    license = licenses.lgpl21;
     platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.gal_bolle
+    maintainers = with maintainers; [
+      gal_bolle vbgl
       ];
   };