diff --git a/app-forensics/yaramod/Manifest b/app-forensics/yaramod/Manifest
index 3d56fcbad..bff601fb5 100644
--- a/app-forensics/yaramod/Manifest
+++ b/app-forensics/yaramod/Manifest
@@ -1 +1,2 @@
 DIST yaramod-3.5.0.tar.gz 679834 BLAKE2B 65142979e313be683908c5e82b08674a0f03fd6dcca83d7168a637b75079e3c2483db06e1febea3fe94fa29f9ffc31f22dff5646b9434d43fda27a89afe14691 SHA512 57152498bcd325cb9edda753ba9b74e538394408c767181c2ae82d6507b817ad01e42b0ffe5cf91571ed3998d79d0762469b3ddd387e79646a76170e1539f878
+DIST yaramod-3.6.0.tar.gz 680194 BLAKE2B c928382d129d8723d80cfd0d224e05dd053612b9ad4cd30c152059d393ebb7aa563eea80753dfb7fad7770f34bc7b6c15ca0399aaac6ab94b8f7ca564e0dd991 SHA512 84708190d1cbf44b30899cfa437c607b1f0f398c2f21777aa90426f25561fae742ce024fe63dfc6479a27d2784a16b05916b831393cb97ff34e7e494d3cfbd5a
diff --git a/app-forensics/yaramod/yaramod-3.6.0.ebuild b/app-forensics/yaramod/yaramod-3.6.0.ebuild
new file mode 100644
index 000000000..6309c7611
--- /dev/null
+++ b/app-forensics/yaramod/yaramod-3.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Parsing of YARA rules into AST and building new rulesets in C++."
+HOMEPAGE="https://github.com/avast/yaramod"
+SRC_URI="https://github.com/avast/yaramod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+#FIXME: python bindings
+#IUSE="python"
+
+DEPEND="dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
diff --git a/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20200420.ebuild b/net-analyzer/crackmapexec/crackmapexec-5.0.1_p20200429.ebuild
similarity index 75%
rename from net-analyzer/crackmapexec/crackmapexec-3.1.5_p20200420.ebuild
rename to net-analyzer/crackmapexec/crackmapexec-5.0.1_p20200429.ebuild
index e820447c5..385a056b6 100644
--- a/net-analyzer/crackmapexec/crackmapexec-3.1.5_p20200420.ebuild
+++ b/net-analyzer/crackmapexec/crackmapexec-5.0.1_p20200429.ebuild
@@ -10,21 +10,18 @@ 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"
-
-#python3 support: https://github.com/byt3bl33d3r/CrackMapExec/issues/317
-#EGIT_REPO_URI="https://github.com/mpgn/CrackMapExec"
-#EGIT_COMMIT="2aca373e33c175d956033bd2b5683fc39ebe44fc"
-#EGIT_BRANCH="python3"
 EGIT_REPO_URI="https://github.com/byt3bl33d3r/CrackMapExec.git"
-EGIT_COMMIT="e294a7292435eee7e1f517989b31fdf227522fdf"
+EGIT_COMMIT="a20d28a885653f335e27d6b2ecd5353f322f8b28"
+
+#https://github.com/byt3bl33d3r/CrackMapExec/issues/354
+EGIT_OVERRIDE_COMMIT_ARTKOND_INVOKE_VNC="906c7476b9490817a6defa63e86a5b8c52690182"
 
 #use system impacket
 EGIT_SUBMODULES=('*' '-*impacket*' '-*pywerview' '-*pywinrm')
-#EGIT_SUBMODULES=('*' '-*impacket*' '-*pywinrm')
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64"
+#WIP
+#KEYWORDS="~amd64"
 IUSE=""
 SLOT="0"
 
@@ -68,23 +65,27 @@ RDEPEND="
 "
 #soupsieve==1.8 not in use?
 
+#QA_PREBUILT="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
 QA_FLAGS_IGNORED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
+QA_PRESTRIPPED="usr/lib.*/python.*/site-packages/cme/data/mimipenguin/.*"
 
-#https://github.com/byt3bl33d3r/CrackMapExec/issues/282
-#https://github.com/byt3bl33d3r/CrackMapExec/issues/317
-PATCHES=( "${FILESDIR}/setup.patch"
-	"${FILESDIR}/invoke-vnc_python3.patch" )
+#invoke: https://github.com/byt3bl33d3r/CrackMapExec/issues/317
+PATCHES=(
+	"${FILESDIR}/setup.patch"
+#	"${FILESDIR}/setup_include.patch"
+	"${FILESDIR}/invoke-vnc_python3.patch"
+	)
 
 python_prepare_all() {
-#	sed -i -e "/pycrypto/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
 }
 
 python_install() {
 	#install data files disabled in setup.patch
 	rm -r cme/thirdparty/{impacket,pywinrm}
+	touch cme/thirdparty/keep_dir
+#	keepdir cme/thirdparty/
 	cp -r cme/{data,thirdparty} "${BUILD_DIR}"/lib/cme
 	distutils-r1_python_install
 }
diff --git a/net-analyzer/crackmapexec/files/setup_include.patch b/net-analyzer/crackmapexec/files/setup_include.patch
new file mode 100644
index 000000000..fd78d1788
--- /dev/null
+++ b/net-analyzer/crackmapexec/files/setup_include.patch
@@ -0,0 +1,10 @@
+--- a/setup.py.orig	2018-12-10 21:11:31.753951980 +0800
++++ b/setup.py	2018-12-12 09:57:24.528955420 +0800
+@@ -17,6 +17,7 @@
+     packages=find_packages(include=[
+         "cme", "cme.*"
+     ]),
++    package_data={'': ['data/*','thirdparty/*']},
+     install_requires=[
+         'pycrypto>=2.6',
+         'pyasn1>=0.1.8',