diff --git a/app-exploits/osslsigncode/osslsigncode-1.7.1_p20150831.ebuild b/app-exploits/osslsigncode/osslsigncode-1.7.1_p20150831.ebuild
deleted file mode 100644
index 0f9e87f8a..000000000
--- a/app-exploits/osslsigncode/osslsigncode-1.7.1_p20150831.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="OpenSSL-based signcode utility"
-HOMEPAGE="https://sourceforge.net/projects/osslsigncode/"
-EGIT_REPO_URI="http://git.code.sf.net/p/osslsigncode/osslsigncode"
-EGIT_COMMIT="e72a1937d1a13e87074e4584f012f13e03fc1d64"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	eautoreconf
-}
diff --git a/app-exploits/the-backdoor-factory/Manifest b/app-exploits/the-backdoor-factory/Manifest
index 8db29c50f..7a7fa3787 100644
--- a/app-exploits/the-backdoor-factory/Manifest
+++ b/app-exploits/the-backdoor-factory/Manifest
@@ -1,2 +1 @@
-DIST the-backdoor-factory-3.4.1.tar.gz 449857 SHA256 69da2f040586e637e7ed67aa7d4e5aabb799f467462f5299563bcbe7123fe21e SHA512 6e58a55089906daab4b1168652ac442a0ef6425c6e57967c97892bb5ed132b076238897df3868f8a3e4595b593562fc7ad235212d4af98afdc25cf5763305fc0 WHIRLPOOL 3e170f04fc33ae225e9fa7cdbb43696cce4f147e1afaf760a78e4dd2140ae199fa067dcff7958ef9c54a73b7d01a65616e1eab3fbf6987ac094a58a08835fa72
-DIST the-backdoor-factory-3.4.2.tar.gz 449954 SHA256 a504caa025b7a374283db321a5cb98e5311cf2922af9ca62701d00b28651a295 SHA512 7ef4ddb0de671f4ef60b6c787ed2d22e901bad96fd738b232dcbe6df58c17baee60178027ec098d1e8f92a7ecb9cfe3ce2948b4a6b054106880204eddb0deda4 WHIRLPOOL 273929540589f2873587b78380c9be66758e49e80923c92f5acc12d55da0e75235881889cb45d97c241cb1f4c48fbbffc28f197e1a5a6845da52dabf9a493d7c
+DIST the-backdoor-factory-3.4.2.tar.gz 449954 BLAKE2B 784f448591328ac24be0695b52ddecb2402ec688989476a4aa70c4187c08541cedc4f2ddd8f435f7c53bebd5a2db72832222704ec3b2c753ec0ff71291cb2767 SHA512 7ef4ddb0de671f4ef60b6c787ed2d22e901bad96fd738b232dcbe6df58c17baee60178027ec098d1e8f92a7ecb9cfe3ce2948b4a6b054106880204eddb0deda4
diff --git a/app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.1.ebuild b/app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.1.ebuild
deleted file mode 100644
index ed507378f..000000000
--- a/app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="BDF allows to patch executable binaries with user desired shellcode"
-HOMEPAGE="https://github.com/secretsquirrel/the-backdoor-factory"
-SRC_URI="https://github.com/secretsquirrel/the-backdoor-factory/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/capstone-python-3.0
-	app-exploits/osslsigncode
-	dev-python/pefile"
-
-src_prepare(){
-	epatch "${FILESDIR}"/pebin.patch
-	rm -r osslsigncode
-	rm {update.sh,install.sh}
-	cp "${FILESDIR}"/certs/* ./certs/
-}
-
-src_compile() {
-	cd ./aPLib/example/
-	gcc -c -I../lib/elf -m32 -Wall -O2 -s -o appack.o appack.c -v
-	gcc -m32 -Wall -O2 -s -o appack appack.o ../lib/elf/aplib.a -v
-	cd ../..
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r "${S}"/*
-
-	dobin ./aPLib/example/appack
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	fperms +x /usr/share/${PN}/backdoor.py
-	dosym /usr/share/${PN}/backdoor.py /usr/bin/${PN}
-}
diff --git a/app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.2.ebuild b/app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.2-r1.ebuild
similarity index 87%
rename from app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.2.ebuild
rename to app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.2-r1.ebuild
index 6c2fe4c79..e6b2ad21d 100644
--- a/app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.2.ebuild
+++ b/app-exploits/the-backdoor-factory/the-backdoor-factory-3.4.2-r1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -14,13 +13,13 @@ SRC_URI="https://github.com/secretsquirrel/the-backdoor-factory/archive/${PV}.ta
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	>=dev-python/capstone-python-3.0
-	app-exploits/osslsigncode
+	app-crypt/osslsigncode
 	dev-python/pefile"
 
 src_prepare(){
@@ -47,5 +46,5 @@ src_install() {
 	python_fix_shebang "${ED}"/usr/share/${PN}
 
 	fperms +x /usr/share/${PN}/backdoor.py
-	dosym /usr/share/${PN}/backdoor.py /usr/bin/${PN}
+	dosym "${EPREFIX}"/usr/share/${PN}/backdoor.py /usr/bin/${PN}
 }