diff --git a/net-analyzer/commix/Manifest b/net-analyzer/commix/Manifest
index d27263483..b4b1897ec 100644
--- a/net-analyzer/commix/Manifest
+++ b/net-analyzer/commix/Manifest
@@ -1 +1,2 @@
 DIST commix-2.5.tar.gz 215830 BLAKE2B a4e8c46d35f6b4d99f5e6de179cca6d6e7550887243e5a1998742c9a9e409eb13ed5988300dca5f54418fb84d2592d3eea29903dd345cd9d728ec6ee16ffff7f SHA512 8c226493e8d5b08cbc4c7ecdf55239acae43389fb2de4fae7419d1542cc286afc4702494df4a9451d9b546380fe7c8bbd55210cd09509ced153514a75d8e632d
+DIST commix-2.6.tar.gz 218928 BLAKE2B 96ad3e9f96ec203c8368ef2a3a90d65a9d9ae9790350dc12e4e84d2a2f19f27b2cca1eaf3a90594c45ea9402856f344a6cd45d6f302e3cb4b687d69c6737a033 SHA512 35eae285224da1e2ec82e0f248f78a9b8df48c77c3022d9cf920c54aacfac6229e5b1286f947a167e160b4f192b4aef65dee35ed92e254c5f0b31860a509172b
diff --git a/net-analyzer/commix/commix-2.6.ebuild b/net-analyzer/commix/commix-2.6.ebuild
new file mode 100644
index 000000000..d9128cd05
--- /dev/null
+++ b/net-analyzer/commix/commix-2.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+EGO_PN=github.com/commixproject/${PN}
+
+inherit python-single-r1 multilib
+
+MY_PV="${PV}-20180921"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/commixproject/commix.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Automated All-in-One OS command injection and exploitation tool"
+HOMEPAGE="https://github.com/commixproject/commix"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/"${PN}"-"${MY_PV}"
+
+src_prepare() {
+	python_fix_shebang .
+	default
+}
+
+src_install(){
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r *
+
+	fperms +x /usr/$(get_libdir)/${PN}/${PN}.py
+	dosym $(get_libdir)/${PN}/${PN}.py ${PN}
+
+	python_optimize "${D}"usr/$(get_libdir)/${PN}
+}