diff --git a/net-wireless/killerbee/Manifest b/net-wireless/killerbee/Manifest
index 22e63fe5f..36e5a4c1c 100644
--- a/net-wireless/killerbee/Manifest
+++ b/net-wireless/killerbee/Manifest
@@ -1 +1,2 @@
 DIST killerbee-0.0.20180606.tar.gz 1442284 BLAKE2B 2b0eaebac2ec103262547195ed03e970517d76d5a293f635964b69f19280b28d91a94b0ea8bb3d20cb4552ca4f714ec7f9492702591b620fb962ce64d1fa43c2 SHA512 dff2c8629b6e4728dbd8a434fd76676a96059ec31a36e546641b686ee8724585a23254c092dab6ae9f85d05785bf2918560ce462d63532dc61fa35f7bb6a3364
+DIST killerbee-2.6.1_pre20180606.tar.gz 1442284 BLAKE2B 2b0eaebac2ec103262547195ed03e970517d76d5a293f635964b69f19280b28d91a94b0ea8bb3d20cb4552ca4f714ec7f9492702591b620fb962ce64d1fa43c2 SHA512 dff2c8629b6e4728dbd8a434fd76676a96059ec31a36e546641b686ee8724585a23254c092dab6ae9f85d05785bf2918560ce462d63532dc61fa35f7bb6a3364
diff --git a/net-wireless/killerbee/killerbee-0.0.20180606.ebuild b/net-wireless/killerbee/killerbee-0.0.20180606.ebuild
deleted file mode 100644
index 9ec087c9c..000000000
--- a/net-wireless/killerbee/killerbee-0.0.20180606.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Framework and Tools for Attacking ZigBee and IEEE 802.15.4 networks"
-HOMEPAGE="https://github.com/riverloopsec/killerbee"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMIT_HASH="57de78a13043dfb6deb4f479f962e2c008aa753d"
-SRC_URI="https://github.com/riverloopsec/killerbee/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-libs/libgcrypt:="
-#DEPEND="doc? ( dev-python/epydoc )
-DEPEND="${RDEPEND}"
-#FIXME: https://bitbucket.org/secdev/scapy-com
-
-#FIXME: doc fails to comiple
-#python_compile_all() {
-#	ewarn "running compile_all"
-#	distutils-r1_python_compile
-#	if use doc; then
-#		mkdir pdf
-#		epydoc --pdf -o pdf killerbee/
-#	fi
-#}
-
-#python_install_all() {
-#	distutils-r1_src_install
-#	if use doc; then
-#		 dodoc "${S}/pdf/*.tex"
-#	fi
-#}
diff --git a/net-wireless/killerbee/killerbee-2.6.1_pre20180606.ebuild b/net-wireless/killerbee/killerbee-2.6.1_pre20180606.ebuild
new file mode 120000
index 000000000..812f7aceb
--- /dev/null
+++ b/net-wireless/killerbee/killerbee-2.6.1_pre20180606.ebuild
@@ -0,0 +1 @@
+killerbee-9999.ebuild
\ No newline at end of file
diff --git a/net-wireless/killerbee/killerbee-9999.ebuild b/net-wireless/killerbee/killerbee-9999.ebuild
index ad0519ac3..1df1c4c4c 100644
--- a/net-wireless/killerbee/killerbee-9999.ebuild
+++ b/net-wireless/killerbee/killerbee-9999.ebuild
@@ -1,21 +1,29 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
+#DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/riverloopsec/killerbee.git"
+	KEYWORDS=""
+else
+	COMMIT_HASH="57de78a13043dfb6deb4f479f962e2c008aa753d"
+	SRC_URI="https://github.com/riverloopsec/killerbee/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+fi
 
 DESCRIPTION="Framework and Tools for Attacking ZigBee and IEEE 802.15.4 networks"
 HOMEPAGE="https://github.com/riverloopsec/killerbee"
-EGIT_REPO_URI="https://github.com/riverloopsec/killerbee.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]