diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index ce0c8dfacfd75..d852875e942b6 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -2,3 +2,4 @@ DIST menhir-20141215.tar.gz 556231 SHA256 2592967c123a31e1b6566ab9f6034e7a0a709d
 DIST menhir-20150914.tar.gz 626388 SHA256 a3057ec0867377ceaf9caecf69d331440d9c0fb70e39ade619a7856aa67d535d SHA512 7717fcc63ae938eb7c8ae3a5e7d279a357735c0e3b062d9060cc70d3016640e1427d25ee8182e3e034c678d9b0e706fe219f707dd4d14689457f321b135b1fef WHIRLPOOL d66204d753d0677f9eb51d09641f9148077e62caa7ae042665697036457724040950bbb190df6bd029224a0607a67cac8f4597927b4f667ca09091e07d09f7bd
 DIST menhir-20150921.tar.gz 627213 SHA256 4d8588dc847ef33f3af64d30e19bc791a57f61cda2b7086267bc8743ea4a2622 SHA512 a3100819cef6577c2806ebab765c966c11acd9fc9de061e64ef1bf4ca8b0076b0b878f12abf951a3c5882216f173936f2899444ca4126c477fa9cbef231c6b4e WHIRLPOOL cec19d79e7b79ea3dc2159673082931c8c360a865078d0af0bdd152fd1e481adb7218caf7f404005e6653493d04fda7659c1aa3b7527bbf8e0b75f284ff676d0
 DIST menhir-20151005.tar.gz 627178 SHA256 154f2537472c65e3e395de87484020cc9aedee5898b9c8756cd02245b3a568b0 SHA512 5275732b7d8699b23a470716900a9c28f4123bd85f18d582bf69a839009009782a680bb65fd7e543515898ea5899fd2b1c8eca5c776067b70ef450093d437f82 WHIRLPOOL b500268821f8b14c7cd46447c84c73d72a12365e1d991babf037746fbf76b18f41bdb0ed812d469ef7de7c2e8966f4151272773d2cd3b3fce250bc21b506dee0
+DIST menhir-20151012.tar.gz 627290 SHA256 c7d4e8cf8e3b009577794c5c01f590379201c77fdc61a832e714beffe7cf22be SHA512 04c10a171fdc24078b6340484314c771b97967a91f506a882bdae741bcc2464ccf3e7f5982339f8cc836abdb0066dc7bcd58a38edbc730a89daf935979fee79c WHIRLPOOL 49b8b0ff0e094e6a5429d747d4ced5ee5515a2f77812f508bd9da872653539ff5540639f6a5a812e4999a7a815bb62b9a6534a71f476dc495a0297ef8f89d737
diff --git a/dev-ml/menhir/menhir-20151012.ebuild b/dev-ml/menhir/menhir-20151012.ebuild
new file mode 100644
index 0000000000000..a8d4107fe6111
--- /dev/null
+++ b/dev-ml/menhir/menhir-20151012.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	if ! use ocamlopt ; then
+		export TARGET=byte
+	fi
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr -j1
+}
+
+src_install() {
+	findlib_src_preinst
+	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
+	use examples && docompress -x /usr/share/doc/${PF}/demos
+	dodoc AUTHORS CHANGES
+}