diff --git a/app-exploits/routersploit/metadata.xml b/app-exploits/routersploit/metadata.xml
index ebc718e70..c97df3309 100644
--- a/app-exploits/routersploit/metadata.xml
+++ b/app-exploits/routersploit/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>email@linxon.ru</email>
-		<name>Yury Martynov</name>
+		<email>sidhayn@gmail.com</email>
+		<name>Zero_Chaos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">threat9/routersploit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-exploits/routersploit/routersploit-3.4.0-r1.ebuild b/app-exploits/routersploit/routersploit-3.4.0-r2.ebuild
similarity index 100%
rename from app-exploits/routersploit/routersploit-3.4.0-r1.ebuild
rename to app-exploits/routersploit/routersploit-3.4.0-r2.ebuild
diff --git a/app-exploits/routersploit/routersploit-9999.ebuild b/app-exploits/routersploit/routersploit-9999.ebuild
index 51c04d850..8f3b3a989 100644
--- a/app-exploits/routersploit/routersploit-9999.ebuild
+++ b/app-exploits/routersploit/routersploit-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="readline(+)"
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 
@@ -16,7 +17,8 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	# This needs a patch to remove future requirement
+	# KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="BSD"
@@ -24,7 +26,6 @@ SLOT="0"
 IUSE="doc"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/future[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/pysnmp[${PYTHON_USEDEP}]