diff --git a/dev-python/pymodbus/Manifest b/dev-python/pymodbus/Manifest
index 729881e9b..92a86ea8d 100644
--- a/dev-python/pymodbus/Manifest
+++ b/dev-python/pymodbus/Manifest
@@ -1,3 +1,3 @@
 DIST pymodbus-2.5.3.tar.gz 165383 BLAKE2B c0f77826ceed12ec7cd79b75901db06737f2f689bd4a458861c9548442494f3193d948007eecfff9cadb861658cf5bd82b7cbd5afac1631c70b14321a97e9562 SHA512 759ad4a333b3e40b839cd5fbb60a455f0b9756f1a7b9f77688916fa73163641a7b6a54ef72137e38035b56a2d473f3c6e3fff88fa84a7695544a5b75b2d5d6f3
-EBUILD pymodbus-2.5.3.ebuild 942 BLAKE2B ca409de0c6fca7efc9012a3ce3e507393ea72de3d7ff796f446c3dc20aa2a83f63466c0cb9de5c070fecd152ee4156744304bd33e83a742bc750b859fe87fc2c SHA512 d138415a263009868bfcd5056de7c80ebf998e22769d00a6a1b71f64e9aeb5ef6bba97a3986279ffe4553cb6d7a3995e35d060e2aeb92bdb4eb35488912bea5a
+EBUILD pymodbus-2.5.3-r1.ebuild 1508 BLAKE2B 8c1e90ef3df033eb7b2acd1ddfd2db8cbb12cbf76165337eaa99182e24a9a6e2eab7897c338ad930d60c1e8f1d6a958282eb8e28d883f10a282bc465314c8694 SHA512 1c6a3b3b353d830d3df47df1d32615d3eba10554f311e05c36120610e922c9f9de2810675804be6ee80bb358151e7148c1337abe0a611c9cefba6770b8fea711
 MISC metadata.xml 575 BLAKE2B 566382803c8b1fe2b4a433f17e7a8c98085a10a50023c073f607a1b19138b1bcddee8fb8c13db072cf878b30333ee44299edd9cbda3f55e0ef4e0649ca4c6719 SHA512 8afafb4bf67ef07618a9fcc8cb2364b5b3a9364f1cd3ff8c48759a02aa3ebf24d0464d4dd1bbbcbb746041ac53ee9977f1fa2d0097b73301d39433d619f20df4
diff --git a/dev-python/pymodbus/pymodbus-2.5.3-r1.ebuild b/dev-python/pymodbus/pymodbus-2.5.3-r1.ebuild
new file mode 100644
index 000000000..0502a7c02
--- /dev/null
+++ b/dev-python/pymodbus/pymodbus-2.5.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A fully featured modbus protocol stack in python"
+HOMEPAGE="https://github.com/riptideio/pymodbus/ https://pypi.org/project/pymodbus/"
+MY_PV=${PV/_/}
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="datastore serial test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/typer-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-3.0.8[${PYTHON_USEDEP}]
+	datastore? (
+		>=dev-python/redis-2.0.16[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.1.15[${PYTHON_USEDEP}]
+	)
+	serial? (
+		>=dev-python/pyserial-3.5[${PYTHON_USEDEP}]
+		~dev-python/pyserial-asyncio-0.6[${PYTHON_USEDEP}]
+	 )"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	sed "/prompt-toolkit==/c\prompt-toolkit" -i requirements.txt || die
+	eapply_user
+}
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/pymodbus/pymodbus-2.5.3.ebuild b/dev-python/pymodbus/pymodbus-2.5.3.ebuild
deleted file mode 100644
index fd6959174..000000000
--- a/dev-python/pymodbus/pymodbus-2.5.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A fully featured modbus protocol stack in python"
-HOMEPAGE="https://github.com/riptideio/pymodbus/ https://pypi.org/project/pymodbus/"
-MY_PV=${PV/_/}
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test serial"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.15.0[${PYTHON_USEDEP}]
-	serial? ( >=dev-python/pyserial-3.4[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}