diff --git a/app-exploits/routersploit/Manifest b/app-exploits/routersploit/Manifest
index 765109132..d5a81d6ae 100644
--- a/app-exploits/routersploit/Manifest
+++ b/app-exploits/routersploit/Manifest
@@ -1,2 +1 @@
-DIST routersploit-3.3.0.tar.gz 454798 BLAKE2B 95eb8f076975d174ff080e6dae1fec86d5918f5fa3f847d07ca1dbb8eafb51752621c18f57be9548fc202df331727cb8c958848e71aed4fa9cccb243d0fd6ffb SHA512 fc43c9df65a543f6fff95a2e6b3c65f1c96e06bcfbe7c6d6b6fc319a2c57f57a999ca9f320e3cbba335f470ac4d8d4cacc7712b44c25888d80ac85355bc0136e
 DIST routersploit-3.4.0.tar.gz 465082 BLAKE2B 8d2077a42155d66d8e7a3840ffc5183c5afee34622e9fc0106ea54321c756e685e76667df280212e0f1040cf60fbf95221e5a7b011026f6b711ef96235bc7b6b SHA512 9182598105c4d1c971dc63ac24059469dd1862af204f59994cfc85012091663a85faee4c7c04cce573eef1fa91525b44a3963b8c24460d3b31595c4ef6a6c4e5
diff --git a/app-exploits/routersploit/metadata.xml b/app-exploits/routersploit/metadata.xml
new file mode 100644
index 000000000..ebc718e70
--- /dev/null
+++ b/app-exploits/routersploit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-exploits/routersploit/routersploit-3.4.0.ebuild b/app-exploits/routersploit/routersploit-3.4.0-r1.ebuild
similarity index 100%
rename from app-exploits/routersploit/routersploit-3.4.0.ebuild
rename to app-exploits/routersploit/routersploit-3.4.0-r1.ebuild
diff --git a/app-exploits/routersploit/routersploit-9999.ebuild b/app-exploits/routersploit/routersploit-9999.ebuild
index 5902f7ce1..f50b7c2c0 100644
--- a/app-exploits/routersploit/routersploit-9999.ebuild
+++ b/app-exploits/routersploit/routersploit-9999.ebuild
@@ -1,64 +1,46 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="readline(+)"
 
-inherit python-single-r1
-# distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/threat9/routersploit.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/threat9/routersploit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
+inherit distutils-r1
 
 DESCRIPTION="An open-source exploitation framework dedicated to embedded devices"
 HOMEPAGE="https://github.com/threat9/routersploit/wiki"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/threat9/routersploit"
+else
+	SRC_URI="https://github.com/threat9/routersploit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc desktopicons bluetooth"
+IUSE="doc"
 
-DEPEND=">=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/pysnmp-4.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-2.6.1[${PYTHON_USEDEP}]
-	bluetooth? ( dev-python/bluepy )"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/pysnmp[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/bluepy[${PYTHON_USEDEP}]"
 
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	#do not compile
-	rm -f Makefile
-	eapply_user
-}
-
-src_install() {
-	dodir /opt/${PN}
-	insinto  /opt/${PN}
-	doins -r routersploit/ rsf.py
-	fperms +x /opt/${PN}/rsf.py
-	dosym "${EPREFIX}"/opt/${PN}/rsf.py /usr/bin/rsf
-
-	if use doc; then
-		einstalldocs /usr/share/doc/${PN}/
-		dodoc -r /{README.md,LICENSE}
-	fi
-
-	#FIXME: convert to desktop.eclass
-	if use desktopicons; then
-		dodir /usr/share/icons/${PN}/
-		cp  ${FILES}/{routersploit.png,routersploit.svg}  /usr/share/icons/${PN}/
-		dodir  /usr/share/applications/${PN}/
-		cp ${FILES}*.desktop  /usr/share/applications/${PN}/
-		fixperms +r +x /usr/share/applications/${PN}/*.desktop
-	fi
-
+	# TODO: add tests support
+	rm -rf tests || die
+
+	# use normal oldstyle names of exec files
+	mv rsf.py rsf && sed -i \
+		-e "s/scripts=('rsf.py',),/scripts=('rsf',),/" \
+		setup.py || die
+
+	default
 }