diff --git a/dev-python/pymodbus-repl/Manifest b/dev-python/pymodbus-repl/Manifest
new file mode 100644
index 000000000..ea40033bb
--- /dev/null
+++ b/dev-python/pymodbus-repl/Manifest
@@ -0,0 +1 @@
+DIST pymodbus_repl-2.0.3.tar.gz 33049 BLAKE2B f987151dccab2a557ac37abc832c9d5f986cdf1d6f10cc3016a7b67bc40f0d5b1dd24ece7c0ed06d3ab778650d7b1e0b8d72e5cc877523b43b65699e207d00bd SHA512 6a452d49a3fa6151099b00521064af49c4d0f48214c8182fdc91463d6b8b7694aa5eb712f09ec4981084bde90962a9a9497e48ac40ea35922bcaaa51567e7314
diff --git a/dev-python/pymodbus-repl/metadata.xml b/dev-python/pymodbus-repl/metadata.xml
new file mode 100644
index 000000000..ddb264b51
--- /dev/null
+++ b/dev-python/pymodbus-repl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>unknown@pentoo.ch</email>
+		<name>Author Unknown</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pymodbus-dev/repl</remote-id>
+		<remote-id type="pypi">pymodbus-repl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pymodbus-repl/pymodbus-repl-2.0.3.ebuild b/dev-python/pymodbus-repl/pymodbus-repl-2.0.3.ebuild
new file mode 100644
index 000000000..becd68d8a
--- /dev/null
+++ b/dev-python/pymodbus-repl/pymodbus-repl-2.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..12} )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1 pypi
+
+DESCRIPTION="REPL (Read-Eval-Print Loop) tool for working with Modbus devices using the Pymodbus library."
+HOMEPAGE="https://github.com/pymodbus-dev/repl https://pypi.org/project/pymodbus-repl/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS="README.md"
+
+RDEPEND="
+	$(python_gen_cond_dep '>=dev-python/aiohttp-3.9.0[${PYTHON_USEDEP}]' python3_12)
+	$(python_gen_cond_dep '>=dev-python/aiohttp-3.8.6[${PYTHON_USEDEP}]' python3_11)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pymodbus/Manifest b/dev-python/pymodbus/Manifest
index 0fe79895a..15c9afb95 100644
--- a/dev-python/pymodbus/Manifest
+++ b/dev-python/pymodbus/Manifest
@@ -1 +1 @@
-DIST pymodbus-2.1.0.tar.gz 130214 BLAKE2B 52b754c06c28c104da10cecafe3212b00b919e794f0de8f753fc2410c12240165e3177a0a1f428eed15a97dbe65354cd79872d228c919aad587cf7e2e163fc1b SHA512 b7b8680b1c9618053f1bdb04a83c283a74ab5c867ef729786ff24a29d63828ff8d4484d388ce827be3bc45d186ee77b7c76f1633496c6de21a960a094b5d68cd
+DIST pymodbus-3.6.9.tar.gz 193922 BLAKE2B db47395187d94aa2f6ecd5d3b4bac2323f9fcc55aea3f97bf9720becf195afcf79a7bd91802fab81037d8f4b1c64174fc954dc8b26cc5d7b43408188ff3d0963 SHA512 a7060f0512a283c6320e45723313fc2623146a6f08618af63903f30e1c9bf706b6fa258210c58ce2eb0abb217f9ee580b5810f589554675af801637716ba0d88
diff --git a/dev-python/pymodbus/metadata.xml b/dev-python/pymodbus/metadata.xml
index ace7c2d3a..82e065ee8 100644
--- a/dev-python/pymodbus/metadata.xml
+++ b/dev-python/pymodbus/metadata.xml
@@ -5,4 +5,8 @@
 		<email>unknown@pentoo.ch</email>
 		<name>Author Unknown</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">riptideio/pymodbus</remote-id>
+		<remote-id type="pypi">pymodbus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymodbus/pymodbus-2.1.0.ebuild b/dev-python/pymodbus/pymodbus-2.1.0.ebuild
deleted file mode 100644
index 0b18abc1a..000000000
--- a/dev-python/pymodbus/pymodbus-2.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="A fully featured modbus protocol stack in python"
-HOMEPAGE="https://github.com/riptideio/pymodbus/ https://pypi.org/project/pymodbus/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pep8-1.7.0[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/pymodbus/pymodbus-3.6.9.ebuild b/dev-python/pymodbus/pymodbus-3.6.9.ebuild
new file mode 100644
index 000000000..388bd07b3
--- /dev/null
+++ b/dev-python/pymodbus/pymodbus-3.6.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A fully featured modbus protocol stack in python"
+HOMEPAGE="https://github.com/riptideio/pymodbus/ https://pypi.org/project/pymodbus/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/pymodbus-repl[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+#python_test() {
+#	nosetests --verbose || die
+#	py.test -v -v || die
+#}