diff --git a/srcpkgs/pfff/patches/lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch b/srcpkgs/pfff/patches/lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch
new file mode 100644
index 0000000000..d9fe1d3329
--- /dev/null
+++ b/srcpkgs/pfff/patches/lang_js-analyze-module_js.ml-Fix-invalid-documentati.patch
@@ -0,0 +1,80 @@
+From 90424f6a206b32c0995e043fe404e694c884b5d3 Mon Sep 17 00:00:00 2001
+From: Juergen Hoetzel <juergen@archlinux.org>
+Date: Mon, 24 Aug 2015 13:55:44 +0200
+Subject: [PATCH] * lang_js/analyze/module_js.ml: Fix invalid documentation
+ comments. Refs #130
+
+See: http://caml.inria.fr/mantis/view.php?id=6916
+---
+ lang_js/analyze/module_js.ml | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git lang_js/analyze/module_js.ml
+index 1433bf0..3bf63b3 100644
+--- lang_js/analyze/module_js.ml
++++ lang_js/analyze/module_js.ml
+@@ -48,50 +48,50 @@ type shape =
+ 	| LiteralShape
+ 	| ArrayShape
+ 
+-	(** _((id,container,maps) ref) **)
++	(* _((id,container,maps) ref) *)
+ 	(* this is a ref to allow extensible representations *)
+ 	(* id is unique, and is used to prune infinite recursion *)
+ 	(* maps is an ObjectShape list *)
+ 	| ObjectShape of (int * shape smap * shape list) ref
+ 
+-	(** _(block,constructor) **)
++	(* _(block,constructor) *)
+ 	(* block is an ObjectShape *)
+ 	(* constructor is a ClassShape *)
+     | FunctionShape of shape Common.smap ref * shape
+ 
+-	(** _(module) **)
++	(* _(module) *)
+ 	| RequireShape of module_
+ 
+-	(** _(reason) **)
++	(* _(reason) *)
+ 	| UnknownShape of string
+ 
+-	(** _(instance, static) **)
++	(* _(instance, static) *)
+ 	(* instance is a ObjectShape *)
+ 	(* static is a ObjectShape where static.prototype is a ObjectShape *)
+ 	| ClassShape of shape * shape
+ 
+-	(** _(class) **)
++	(* _(class) *)
+ 	(* class is a ClassShape *)
+ 	(* returns an ObjectShape *)
+ 	| NewShape of shape
+ 
+-	(** _(maps) **)
++	(* _(maps) *)
+ 	(* maps is an ObjectShape *)
+ 	(* returns a ClassShape *)
+ 	| MixinShape of shape
+ 
+-	(** _(class,mixin) **)
++	(* _(class,mixin) *)
+ 	(* class is a ClassShape, mixin is a ClassShape *)
+ 	(* returns a ClassShape *)
+ 	| ClassWithMixinShape of shape * shape
+ 
+-	(** _(object,prop) **)
++	(* _(object,prop) *)
+ 	| PropertyShape of shape * string
+ 
+-	(** _(function) **)
++	(* _(function) *)
+ 	| ApplyShape of shape
+ 
+-	(** _(array) **)
++	(* _(array) *)
+ 	| ElementShape of shape
+ 
+ let fresh_id =
+-- 
+2.5.0
+
diff --git a/srcpkgs/pfff/patches/lang_js-analyze-utils_js.mli.patch b/srcpkgs/pfff/patches/lang_js-analyze-utils_js.mli.patch
new file mode 100644
index 0000000000..6820b18393
--- /dev/null
+++ b/srcpkgs/pfff/patches/lang_js-analyze-utils_js.mli.patch
@@ -0,0 +1,31 @@
+From 1658a7f55af6884644909901523a28d2df7416d7 Mon Sep 17 00:00:00 2001
+From: pad <yoann.padioleau@gmail.com>
+Date: Thu, 20 Aug 2015 09:58:29 -0700
+Subject: [PATCH 68/72] * lang_js/analyze/utils_js.mli: fix issue #130
+
+---
+ lang_js/analyze/utils_js.mli | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git lang_js/analyze/utils_js.mli
+index 637b832..19a8cbb 100644
+--- lang_js/analyze/utils_js.mli
++++ lang_js/analyze/utils_js.mli
+@@ -1,8 +1,9 @@
+ 
+-(** print utils **)
++(* print utils *)
+ val string_of_any : Ast_js.any -> string
+ 
+-(** Example: load file task **)
+-(** if file exists, unmarshal data in the file and return it **)
+-(** otherwise, run task to generate data, store it in the file, and return it **)
++(* Example: load file task
++ * if file exists, unmarshal data in the file and return it
++ * otherwise, run task to generate data, store it in the file, and return it 
++ *)
+ val load : Common.filename -> (unit -> 'a) -> 'a
+-- 
+2.5.0
+
+
diff --git a/srcpkgs/pfff/template b/srcpkgs/pfff/template
new file mode 100644
index 0000000000..72d7384016
--- /dev/null
+++ b/srcpkgs/pfff/template
@@ -0,0 +1,29 @@
+# Template build file for 'pfff'
+pkgname=pfff
+version=0.29
+revision=1
+build_style=configure
+configure_args="--prefix=/usr"
+short_desc="Tools and APIs for code analysis, visualization and transformation"
+maintainer="John Regan <john@jrjrtech.com>"
+license="LGPL-2.1"
+homepage="https://github.com/facebook/pfff"
+distfiles="$homepage/archive/v${version}.tar.gz"
+checksum="d31c68f1ebb1770297eb26441d21d83728c0fbdb9c7bb3be27625db45fae72d1"
+makedepends="perl ocaml ocaml-findlib camlp4 zlib-devel ncurses-devel"
+depends="ocaml"
+nocross="yes"
+nostrip="yes"
+
+do_build() {
+	make depend
+	make
+	make opt
+}
+
+do_install() {
+	make DESTDIR=$DESTDIR install
+	mkdir -p $DESTDIR/usr/lib/ocaml
+	make OCAMLFIND_LDCONF=$DESTDIR/tmp/ld.conf OCAMLFIND_DESTDIR=$DESTDIR/usr/lib/ocaml install-findlib
+}
+