diff --git a/app-forensics/yara/Manifest b/app-forensics/yara/Manifest
index 4df62a90b..4c2d3a571 100644
--- a/app-forensics/yara/Manifest
+++ b/app-forensics/yara/Manifest
@@ -1,4 +1,3 @@
-DIST yara-3.5.0.tar.gz 7648499 SHA256 4bc72ee755db85747f7e856afb0e817b788a280ab5e73dee42f159171a9b5299 SHA512 84e3b8248749271f154c05216417be76c56563012c0a2013fde5184c6ed03d2933c456d61f036292c42030b52705d5c6e94824d1fd36dbffe46af625ddedaaf5 WHIRLPOOL 77994502920847df9a7379ff2e7b5275ee259a84191ffbb270138d4b4a08797368f9e5ea312b1abd93b3b86e678f26319fc3da01cf2743502825162533f970c4
-DIST yara-3.6.3.tar.gz 505556 SHA256 ad2c0e788b4d8b2f3e9078f448754313249a302b749b9a24e932bfc5e141a5e8 SHA512 f928fe93e93385b5711c1076b042473299e1eb1c7c345433b01b7638677d9b8fb95a8ac2a7ef52012dc178ec0ef5772d6b6d0b65b5717d2074290bb44031b3f8 WHIRLPOOL d0ccebaeac3a3a0e76b323343e60c7fd3f1e349f729def841928e04ea979ee2d7a41444570b0ffc56701790fb135b0fa1ab3008b914e48260f0dfffc5953e383
-DIST yara-3.7.0.tar.gz 558035 SHA256 01f0841e7387918c2b6d0b7fb48014bda41d1487be1cabf718a0576018969641 SHA512 cd0214d39c6d1c5bc8410a1ec67e42ec8a672be382fb11e0a0f98cb03af1ef5db92e74216a9b98a6bdedf9721d4470639e340edbd39ca0184233652839742a33 WHIRLPOOL c6b0644301c5f3e0897c8712c3547792820a1e259ef97ae364fc230100faa1b33aeb3bf97da22974cbc830c06b2c3821110459544d761ecbee4d2609e9729c59
-DIST yara-3.7.1.tar.gz 558499 SHA256 df077a29b0fffbf4e7c575f838a440f42d09b215fcb3971e6fb6360318a64892 SHA512 cfb03a36a490e87544b1d315979991a6b6f4d2dbfe5c712ae321a1835a5378a86ed3ae2a65059741cf02cad2495761d90b26c56d67628a334f50f3bf4041b784 WHIRLPOOL 59c2726988541243b0f82094eaab788dafce6bd42f8c4f542d09ca86f0b4dbf022e8a13cb901a5ec44c3ff6192dabb11e6600aad94a330664f4233ced8095f8a
+DIST yara-3.7.0.tar.gz 558035 BLAKE2B d4495720e70b6cd03dbb7c388a8e02a4efca53d136fd7b51a8d4149cca5ebde4ee43bb197e476d757243c59559582033c3f78c6737e57819dd9d2b174a70a45d SHA512 cd0214d39c6d1c5bc8410a1ec67e42ec8a672be382fb11e0a0f98cb03af1ef5db92e74216a9b98a6bdedf9721d4470639e340edbd39ca0184233652839742a33
+DIST yara-3.7.1.tar.gz 558499 BLAKE2B 72b511521208ec1c4d308ff382b3dc6dbd71c47ca6297b1cb8cfbbcbb54b1946fc1c63635b1a0a77e22ff32646ab088d0fec21601c3dcdc4c76be21d54cb8413 SHA512 cfb03a36a490e87544b1d315979991a6b6f4d2dbfe5c712ae321a1835a5378a86ed3ae2a65059741cf02cad2495761d90b26c56d67628a334f50f3bf4041b784
+DIST yara-3.8.0.tar.gz 714919 BLAKE2B d012d0bc954f3706e02099a65050d80674961d48ac0311f18849046109ae8e40ea51caae2958ec3d73ca7ffe936e283911f08700aec7dad004a5217b3e7d4589 SHA512 db6d61a394f6ec7048d068d91df9d4c279fdcc8814bfa0025fa323aabf80bce4e8c176200436ecad3357ca6fd4e6094d17462c8d3edb384a1ef1c6a72b96ecea
diff --git a/app-forensics/yara/yara-3.5.0.ebuild b/app-forensics/yara/yara-3.5.0.ebuild
deleted file mode 100644
index 4ff1a3d67..000000000
--- a/app-forensics/yara/yara-3.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit autotools
-
-DESCRIPTION="A malware identification and classification tool"
-HOMEPAGE="http://virustotal.github.io/yara/"
-SRC_URI="https://github.com/virustotal/yara/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( ~dev-python/yara-python-${PV} )"
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/app-forensics/yara/yara-3.6.3.ebuild b/app-forensics/yara/yara-3.7.1-r1.ebuild
similarity index 82%
rename from app-forensics/yara/yara-3.6.3.ebuild
rename to app-forensics/yara/yara-3.7.1-r1.ebuild
index ad2bc5885..b273c0d89 100644
--- a/app-forensics/yara/yara-3.6.3.ebuild
+++ b/app-forensics/yara/yara-3.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="python"
 
 DEPEND="dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
-PDEPEND="python? ( ~dev-python/yara-python-${PV} )"
+PDEPEND="python? ( =dev-python/yara-python-3.8* )"
 
 src_prepare() {
 	eautoreconf
diff --git a/app-forensics/yara/yara-3.7.1.ebuild b/app-forensics/yara/yara-3.8.0.ebuild
similarity index 82%
rename from app-forensics/yara/yara-3.7.1.ebuild
rename to app-forensics/yara/yara-3.8.0.ebuild
index ad2bc5885..a2bf76b17 100644
--- a/app-forensics/yara/yara-3.7.1.ebuild
+++ b/app-forensics/yara/yara-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="python"
 
 DEPEND="dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
-PDEPEND="python? ( ~dev-python/yara-python-${PV} )"
+PDEPEND="python? ( =dev-python/yara-python-3.7* )"
 
 src_prepare() {
 	eautoreconf
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index 463b0db9a..0e57ac187 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,3 +1 @@
-DIST yara-python-3.5.0.tar.gz 22052 SHA256 e0d564c1a8c98957eda9fb49d4259dcc24b868c98f07a8f2899f24e7bfde6d18 SHA512 aa7da264a230efe55d080f24f6598f15eae4cfe0eaea24d00d86d7d2b9245cabed5bec581f47b3c77cc29200273f859d24b5b5a6547d0a392ea8190260c88c2c WHIRLPOOL d1d85870e86445ede5c18e0fd0da8bdae47b0e89740a50387737d70eae68814c8b4ed0e996bee9802d01258caa8a91536e5a0012ba259e3a0d93fec599d0418f
-DIST yara-python-3.6.3.tar.gz 29631 SHA256 4453c3ec093aef727607d27efa11cd64a565d8e9e80bdde38f508538a4da85bd SHA512 22d69e1dad6ac709e9d1e1e5161b9afc0f9424f211b77ea615c304193d42be2823916d39bcd43a0189d862ff9af31bd80a0abd8e6336f039d4e1089fa2526e6a WHIRLPOOL 89eef2d459b467c19e0b14f400718f71d7e8c52ed3899732568ead8179102117939f0382b4a6faecab8494737c9328b23ac19a86578bea7074c6268b845cb6bf
-DIST yara-python-3.7.0.tar.gz 30722 SHA256 24e1faa05fb85d2d23137e819005cce0a11bdfb5cf303a6ab199f37dff3e0352 SHA512 96d43620787f3369843a3255c3dc6ec7e8dd8afedcb8a5414d964c9a30f4e91277156a2543dd9dc28474fc1cfdbedc90e46ed76c83481673fc2c39dd6dc97f73 WHIRLPOOL 45b1828180445cfda928382b74ddee9c6f7ddb657b03dd6def6e48ccd2896cc91cf5a5a46a03058b95b75f595ee54514da2bcc490333ed45b28316fab62e54ef
+DIST yara-python-3.7.0.tar.gz 30722 BLAKE2B 0576ecc29278c4e68d7bc195b42816a3bacf3d45833326c7c9c3acd50f11e386ebb90661379517af91c3da95f2af6875b09bd020afabe9dcd7e8c22219cbb3f4 SHA512 96d43620787f3369843a3255c3dc6ec7e8dd8afedcb8a5414d964c9a30f4e91277156a2543dd9dc28474fc1cfdbedc90e46ed76c83481673fc2c39dd6dc97f73
diff --git a/dev-python/yara-python/yara-python-3.5.0.ebuild b/dev-python/yara-python/yara-python-3.5.0.ebuild
deleted file mode 100644
index 738fd3dfa..000000000
--- a/dev-python/yara-python/yara-python-3.5.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="~app-forensics/yara-${PV}"
-RDEPEND="${DEPEND}"
-
-#S="${WORKDIR}/yara-${PV}/yara-python"
diff --git a/dev-python/yara-python/yara-python-3.6.3.ebuild b/dev-python/yara-python/yara-python-3.6.3.ebuild
deleted file mode 100644
index 4f61374c5..000000000
--- a/dev-python/yara-python/yara-python-3.6.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="~app-forensics/yara-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/yara-python/yara-python-3.7.0.ebuild b/dev-python/yara-python/yara-python-3.7.0.ebuild
index 4f61374c5..519968505 100644
--- a/dev-python/yara-python/yara-python-3.7.0.ebuild
+++ b/dev-python/yara-python/yara-python-3.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python interface for a malware identification and classification tool"
@@ -14,5 +14,5 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="~app-forensics/yara-${PV}"
+DEPEND="=app-forensics/yara-3.7*"
 RDEPEND="${DEPEND}"
diff --git a/profiles/pentoo/base/package.accept_keywords/app-forensics b/profiles/pentoo/base/package.accept_keywords/app-forensics
index 933d3a5b5..045f63944 100644
--- a/profiles/pentoo/base/package.accept_keywords/app-forensics
+++ b/profiles/pentoo/base/package.accept_keywords/app-forensics
@@ -31,3 +31,6 @@ app-forensics/libewf
 ~app-forensics/sleuthkit-4.1.3
 
 =app-forensics/samhain-4.2*
+
+=app-forensics/yara-3.7*
+=dev-python/yara-python-3.7*