diff --git a/dev-java/error-prone-annotations/Manifest b/dev-java/error-prone-annotations/Manifest
new file mode 100644
index 0000000000000..ebc942e2acd25
--- /dev/null
+++ b/dev-java/error-prone-annotations/Manifest
@@ -0,0 +1 @@
+DIST error-prone-2.0.14.tar.gz 677991 SHA256 58f569742ab8b0c381001c60b2dc5b8adbad92f520f8c283927c814f8275cbce SHA512 0bf2c869638e03fea5395e2b84a690c42df320903e48a171537e68a60ae7a47a8a83de07fa0a8dfb03340c035878b4380fd6677ba3bf1d13eeffcfaee4e63658 WHIRLPOOL dbd607552194e71726a5c901262ea64cf7fad7f453449e41c928ddc634eacc1a884b0d0b5e05df54d5d199871409edd3b5d4e43c16ad603b7dd7917a86db4804
diff --git a/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
new file mode 100644
index 0000000000000..68defc2056ecf
--- /dev/null
+++ b/dev-java/error-prone-annotations/error-prone-annotations-2.0.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN%-annotations}"
+MY_P="${MY_PN}-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java annotations for the Error Prone static analysis tool"
+HOMEPAGE="http://errorprone.info"
+SRC_URI="https://github.com/google/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/annotations"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/error-prone-annotations/metadata.xml b/dev-java/error-prone-annotations/metadata.xml
new file mode 100644
index 0000000000000..2411fd6e87c92
--- /dev/null
+++ b/dev-java/error-prone-annotations/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/error-prone</remote-id>
+	</upstream>
+</pkgmetadata>