diff --git a/dev-erlang/protobuffs/Manifest b/dev-erlang/protobuffs/Manifest
index 7375676d945ef..f39528cc694e3 100644
--- a/dev-erlang/protobuffs/Manifest
+++ b/dev-erlang/protobuffs/Manifest
@@ -1 +1,2 @@
 DIST protobuffs-0.8.2.tar.gz 132660 SHA256 82e196d6d9b95e2df1f420f2d39ca54f6eba92e65ca5aa6119f8310822e6b4d3 SHA512 56e9f8d41c500769724adadf025e3915e2b1ab6b68f1664080a49e783facf3d79b5ec20eb8664db9babeea21fc0637c88b1e4a121ca810247e32831a79171b11 WHIRLPOOL 368524db4587446e75d71b340c2369775c6b9ee5742aef60ee1da41a506c9b72ce4f9ff2fc3ad17d399f4d959415ca013562b6d12da9f68a9ac38516a8a34805
+DIST protobuffs-0.9.0.tar.gz 237560 SHA256 0194ad3ce489f9b76fd6566763819d7ee2036e1e031c45347c16086478d5a1c1 SHA512 f5838723c5e5ae55f412848978729347186075917893e0b74e5af966ced9f12e8bc65906f3e591c78a99e64d70461df46e5719b83c262e9bbc5acfd1e50ae1d2 WHIRLPOOL 86185332a736e69a9667e8aa732a6a4631bb411c7d66f0a6d7b319c265add8ae55d76662d3eadae87c45bce5f280c89460da391a639cb15671027f80cd2c4e79
diff --git a/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild b/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild
new file mode 100644
index 0000000000000..8ae511da42575
--- /dev/null
+++ b/dev-erlang/protobuffs/protobuffs-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rebar
+
+MY_PN="erlang_protobuffs"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Google's Protocol Buffers for Erlang"
+HOMEPAGE="https://github.com/basho/erlang_protobuffs"
+SRC_URI="https://github.com/basho/${MY_PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-lang/erlang-17.1"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-erlang/meck-0.8.2
+		>=dev-erlang/proper-1.1
+	)"
+RDEPEND="${CDEPEND}"
+
+DOCS=( AUTHORS  ChangeLog  README.md RELNOTES.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	./scripts/generate_emakefile.escript || die
+	erebar ct
+	# FIXME: 1 test fails, reported upstream:
+	# FIXME: https://github.com/basho/erlang_protobuffs/issues/100
+	# FIXME: erebar eunit
+}