diff --git a/dev-python/capstone-python/capstone-python-3.0.4.ebuild b/dev-python/capstone-python/capstone-python-3.0.4.ebuild
new file mode 100644
index 000000000..dcea060ec
--- /dev/null
+++ b/dev-python/capstone-python/capstone-python-3.0.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: blshkv$
+
+EAPI=5
+
+MY_P=capstone-"${PV}"
+PYTHON_COMPAT=( python{2_7,3_4} )
+inherit eutils multilib distutils-r1
+
+DESCRIPTION="A lightweight multi-platform, multi-architecture disassembly framework"
+HOMEPAGE="http://www.capstone-engine.org/"
+SRC_URI="https://github.com/aquynh/capstone/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cython"
+
+RDEPEND="cython? ( dev-python/cython
+	dev-util/capstone[python] )"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}/bindings/python
+
+python_prepare() {
+	#our hack to adjust cython setup
+	if use cython; then
+		cp setup_cython.py setup.py
+#		sed -e 's|install:|install_default:|' -i Makefile || die "sed failed"
+#		sed -e 's|install_cython:|install:|' -i Makefile || die "sed failed"
+		#this section is from Makefile
+		cp capstone/__init__.py pyx/__init__.py
+		for i in arm{,_const} arm64{,_const} mips{,_const} ppc{,_const} x86{,_const} sparc{,_const} systemz sysz_const xcore{,_const}; do
+			cp capstone/${i}.py pyx/${i}.pyx
+		done
+	fi
+}
diff --git a/dev-util/capstone/capstone-3.0.4.ebuild b/dev-util/capstone/capstone-3.0.4.ebuild
new file mode 100644
index 000000000..9c9629316
--- /dev/null
+++ b/dev-util/capstone/capstone-3.0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: blshkv$
+
+EAPI=5
+
+inherit eutils multilib
+
+#MY_PV=${PV//_/-}
+DESCRIPTION="A lightweight multi-platform, multi-architecture disassembly framework"
+HOMEPAGE="http://www.capstone-engine.org/"
+SRC_URI="https://github.com/aquynh/capstone/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="python"
+
+RDEPEND="python? ( >=dev-python/capstone-python-${PV} )"
+RDEPEND=""
+DEPEND=""
+#TODO: add java and ocaml bindings
+
+#S=${WORKDIR}/${PN}-${MY_PV}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIRARCH=$(get_libdir) install
+#	if use !test; then
+#		dodir /usr/share/"${PN}"/
+#		cp -R "${S}"/tests "${D}/usr/share/${PN}/" || die "Install failed!"
+#	fi
+	dodoc README
+}