diff --git a/dev-python/pymisp/metadata.xml b/dev-python/pymisp/metadata.xml
index c4511c144..c775d0ca6 100644
--- a/dev-python/pymisp/metadata.xml
+++ b/dev-python/pymisp/metadata.xml
@@ -5,4 +5,8 @@
     <email>email@linxon.ru</email>
     <name>Yury Martynov</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">MISP/PyMISP</remote-id>
+    <remote-id type="pypi">pymisp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/pymisp/pymisp-2.4.124-r1.ebuild b/dev-python/pymisp/pymisp-2.4.124-r1.ebuild
index c977293d9..8c32d75d1 100644
--- a/dev-python/pymisp/pymisp-2.4.124-r1.ebuild
+++ b/dev-python/pymisp/pymisp-2.4.124-r1.ebuild
@@ -6,15 +6,14 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{12..14} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A python library for using the MISP Rest API"
 HOMEPAGE="https://github.com/MISP/PyMISP"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~mips ~x86"
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
 IUSE="doc test"
 
 CDEPEND="${PYTHON_DEPS}"
@@ -41,8 +40,9 @@ DEPEND="${CDEPEND}
 
 src_test() {
 	# FIXME (20191022-2.4.117): maybe it wrong i dont know
-	# test_object_level_tag (tests.test_mispevent.TestMISPEvent) ... 
-	# skipped 'Not supported on MISP: https://github.com/MISP/MISP/issues/2638 - https://github.com/MISP/PyMISP/issues/168'
+	# test_object_level_tag (tests.test_mispevent.TestMISPEvent) ...
+	# skipped 'Not supported on MISP: https://github.com/MISP/MISP/issues/2638
+	# and https://github.com/MISP/PyMISP/issues/168'
 	esetup.py test || die
 }
 
diff --git a/dev-python/pymisp/pymisp-2.4.152.ebuild b/dev-python/pymisp/pymisp-2.4.152.ebuild
index 32132e7de..807391f2e 100644
--- a/dev-python/pymisp/pymisp-2.4.152.ebuild
+++ b/dev-python/pymisp/pymisp-2.4.152.ebuild
@@ -6,15 +6,14 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{12..14} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A python library for using the MISP Rest API"
 HOMEPAGE="https://github.com/MISP/PyMISP"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm64 x86"
 LICENSE="BSD"
 SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 RESTRICT="test"
 
@@ -37,8 +36,9 @@ DEPEND="${CDEPEND}
 
 #src_test() {
 	# FIXME (20191022-2.4.117): maybe it wrong i dont know
-	# test_object_level_tag (tests.test_mispevent.TestMISPEvent) ... 
-	# skipped 'Not supported on MISP: https://github.com/MISP/MISP/issues/2638 - https://github.com/MISP/PyMISP/issues/168'
+	# test_object_level_tag (tests.test_mispevent.TestMISPEvent) ...
+	# skipped 'Not supported on MISP: https://github.com/MISP/MISP/issues/2638
+	# and https://github.com/MISP/PyMISP/issues/168'
 #	esetup.py test || die
 #}