diff --git a/games-server/bukkit/Manifest b/games-server/bukkit/Manifest
new file mode 100644
index 0000000..798f987
--- /dev/null
+++ b/games-server/bukkit/Manifest
@@ -0,0 +1 @@
+DIST bukkit-1500.tar.gz 261127 SHA256 9c95602929b63c0dd0e7ac1907bde19b0243b59a4e0c4e4c7ed4a19b55d2bacf SHA512 686ed83b2aa0111d488707c4fb9307105409889e2f5cb03b4357664df7b9c2a87baf8a1ed6064b02dc12f43aab9d686c216a2fbafc4a1f026a5ff7bfbc473796 WHIRLPOOL b9933bb3bea5f7ab469da20bcd0d4c0174154af8587b4d8fbca95a2d59daac3a73c4481513bba28ff1faeabe624e029b696cc797255b2eca2d6e619007163346
diff --git a/games-server/bukkit/bukkit-1500.ebuild b/games-server/bukkit/bukkit-1500.ebuild
new file mode 100644
index 0000000..1340d8c
--- /dev/null
+++ b/games-server/bukkit/bukkit-1500.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+COMMIT="87b38c0"
+BUKKIT_API="1.2.5-R5.0"
+JAVA_PKG_IUSE="doc source"
+
+inherit games java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generic API component of the plugin-based server mod for Minecraft"
+HOMEPAGE="http://bukkit.org"
+SRC_URI="https://github.com/Bukkit/Bukkit/tarball/${COMMIT} -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/commons-lang:2.1
+	dev-java/ebean:0
+	dev-java/guava:10
+	>=dev-java/snakeyaml-1.9:0"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=dev-java/json-simple-1.1:0
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}/Bukkit-Bukkit-${COMMIT}"
+
+JAVA_GENTOO_CLASSPATH="commons-lang-2.1 ebean guava-10 snakeyaml"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+
+	mkdir -p target/classes/META-INF/maven/org.bukkit/bukkit || die
+	echo "version=${BUKKIT_API}" > target/classes/META-INF/maven/org.bukkit/bukkit/pom.properties || die
+}
+
+src_install() {
+	java-pkg_register-dependency json-simple
+	java-pkg-simple_src_install
+	dodoc README.md || die
+}