diff --git a/app-crypt/hashkill/Manifest b/app-crypt/hashkill/Manifest
index 9a8a4f0ec..841309243 100644
--- a/app-crypt/hashkill/Manifest
+++ b/app-crypt/hashkill/Manifest
@@ -1,4 +1,6 @@
+AUX hashkill-automake.patch 367 SHA256 a5fe07b8b5ba03b50ad6e71d399a3e55f39b6e1c8c16e632737856a6b3af7cfc SHA512 3cc7f6bda32c0bbb6e4b2afa6b52486e3c07e108b78206e444b40dab6d13a9e46540223135398e1f2e26a7b83254084603be23158cc491efdf6337917c587302 WHIRLPOOL 7384b515173d3cd4d97cf270977dabfff463e993007ab12fc7a136ca5edb0184c7a22a1acd62f1ffcba3911b550320cb93f42407d3d9caa2c9b5efee0d2d5e04
 DIST hashkill-0.2.4.tgz 3543331 SHA256 26a6c0886046f56b50a2bf26bba2ee3a754c57452de7073dcc492e03d8e07022
 DIST hashkill-0.3.0.tar.gz 1956842 SHA256 5f6ccb96277ad049c3765c9cc331fb0821255d47d81991d24fc14bed83bbfa75 SHA512 3261d74e4aa7ebabe7a111ea02e6fb26c45f263d6576e4cf9610cd557f37bc9171b9eae3ad80f3b906d72dc9e7646a0c630cb59665b5bcd2838f2ec4a5b82161 WHIRLPOOL dfad102418a10deff8d9e426a313a6674a4164fb1639a92923b21ded50f6ebc2c1d4443bb3bbe0e0356a3756a7f336cf96dcdc333df4fd02fb0504d4bb4c462b
 EBUILD hashkill-0.2.4.ebuild 596 SHA256 1cf4a1c323fcbc6229bda09457d5a29f2f538870ddebcbc4a59b519af96265d4 SHA512 57d7e7e055cc5d5800691fce7a9c0f738e16302a1dd84c169cd11251a7ac80eabca2e25a2aba0d5da3f3e1c6160d9cdc9386b08f401bf329856a107b86b64b3b WHIRLPOOL b07ee0636016424ae15ec928003635c980d126ee8a1bf82bd5d324f9d9287bcc3ba9362c76015f7efe352408485b97731ca17f110394731791f10a9a5520544f
 EBUILD hashkill-0.3.0.ebuild 1453 SHA256 ad51e3896a14db4612eeab14ae65fb2c74e6c3faa4438f90e3c47187142ca65d SHA512 fbc4cd0e57a38790cd6f129203b938d62ff3c6de0dea386fe9ebe5332d7f3abf600e9ece0521273f81fdff2c82f5ff5750a3ac0dd3d6da547f285b80963a795c WHIRLPOOL c1b1bd9409139230426a874658570ede00d89f8cb5a271dd8d28274b2d158aad693abb626113780d5077d9d8c9fe0990edf89474d93acfd98ba54ed019656cf5
+EBUILD hashkill-9999.ebuild 973 SHA256 4e28168136fc52ee162b0306c67f73f594112c27b9d7c28757e38fe75e5a6d7a SHA512 7209a9079b5ae359556adfc7d1cdfbd0b085bcb91fb6e611d5ee9860dbd3db10edb8ad11c2f806621346905e668a3d03f5bb7e00d1e8ee13cae4f03346d41360 WHIRLPOOL 38963187f39e81ee7087ce55958d5088d6cb6e8ae1dfbb5027b15bfcf306a852c331320c33f8067da175adf0a98ba72a20eac9bfe57b80d2791709fd34361e22
diff --git a/app-crypt/hashkill/files/hashkill-automake.patch b/app-crypt/hashkill/files/hashkill-automake.patch
new file mode 100644
index 000000000..9a476c7e8
--- /dev/null
+++ b/app-crypt/hashkill/files/hashkill-automake.patch
@@ -0,0 +1,14 @@
+--- ltmain.sh.orig	2012-10-03 22:24:53.000000000 +0800
++++ ltmain.sh	2012-10-03 22:35:33.417154216 +0800
+@@ -80,9 +80,9 @@
+ 
+ PROGRAM=libtool
+ PACKAGE=libtool
+-VERSION="2.4.2 Debian-2.4.2-1"
++VERSION="2.4"
+ TIMESTAMP=""
+-package_revision=1.3337
++package_revision=1.3293
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
diff --git a/app-crypt/hashkill/hashkill-9999.ebuild b/app-crypt/hashkill/hashkill-9999.ebuild
new file mode 100644
index 000000000..c5e38656f
--- /dev/null
+++ b/app-crypt/hashkill/hashkill-9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+#WANT_AUTOMAKE="1.12"
+#WANT_AUTOCONF="2.5"
+
+inherit git-2 eutils toolchain-funcs autotools
+
+DESCRIPTION="http://www.gat3way.eu/hashkill"
+HOMEPAGE="Multi-threaded password recovery tool with multi-GPU support"
+EGIT_REPO_URI="git://github.com/gat3way/hashkill.git"
+#SRC_URI="https://github.com/downloads/gat3way/hashkill/${P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="virtual/opencl-sdk"
+RDEPEND="${DEPEND}"
+
+src_prepare () {
+	epatch "${FILESDIR}"/${PN}-automake.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf
+	#the following might fail if gcc is built with USE="multislot"
+	if [[ $(gcc-version) == 4.5 ]] && has_version sys-devel/gcc:4.5[-lto]; then
+	    einfo "Compiling without LTO optimisaiton"
+	    sed -i 's| -flto -fwhole-program||g' src/Makefile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}