diff --git a/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190309.ebuild b/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190309.ebuild
deleted file mode 100644
index fa5460501..000000000
--- a/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190309.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 git-r3
-
-DESCRIPTION="A swiss army knife for pentesting Windows/Active Directory environments"
-HOMEPAGE="https://github.com/byt3bl33d3r/CrackMapExec/releases"
-
-EGIT_REPO_URI="https://github.com/byt3bl33d3r/CrackMapExec.git"
-EGIT_COMMIT="a258bcf409e0d2ef3ce90780c8d38a5d9612c663"
-#use system impacket
-EGIT_SUBMODULES=('*' '-*impacket*')
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-SLOT="0"
-
-RDEPEND="
-	dev-python/asn1crypto[${PYTHON_USEDEP}]
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/cffi[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]
-
-	dev-python/idna[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/ntlm-auth[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	dev-python/pylnk[${PYTHON_USEDEP}]
-	dev-python/pynacl[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests-ntlm[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/selenium[${PYTHON_USEDEP}]
-
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/splinter[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/terminaltables[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-
-	dev-python/impacket[${PYTHON_USEDEP}]
-"
-
-QA_FLAGS_IGNORED="usr/lib.*/python.*/site-packages/data/mimipenguin/.*"
-
-#https://github.com/byt3bl33d3r/CrackMapExec/issues/282
-PATCHES=( "${FILESDIR}/setup.patch" )
-
-python_prepare_all() {
-	sed -i -e "/pycrypto/d" setup.py || die
-	sed -i -e "/bs4/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install(){
-	#install data files disabled in setup.patch
-	rm -r cme/thirdparty/impacket
-	cp -r cme/{data,thirdparty} "${BUILD_DIR}"/lib/cme
-	distutils-r1_python_install
-}
diff --git a/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190314.ebuild b/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190314-r1.ebuild
similarity index 96%
rename from net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190314.ebuild
rename to net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190314-r1.ebuild
index 4f5ddbb68..a4fc3869b 100644
--- a/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190314.ebuild
+++ b/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20190314-r1.ebuild
@@ -66,7 +66,8 @@ PATCHES=( "${FILESDIR}/setup.patch" )
 
 python_prepare_all() {
 #	sed -i -e "/pycrypto/d" setup.py || die
-	sed -i -e "/bs4/d" setup.py || die
+	sed -i -e '/bs4/d' setup.py || die
+	sed -i -e 's#msgpack-python#msgpack#' setup.py || die
 	distutils-r1_python_prepare_all
 }