diff --git a/dev-util/unicorn/metadata.xml b/dev-util/unicorn/metadata.xml
index ce9705eab55cf..0585a8a2d9d37 100644
--- a/dev-util/unicorn/metadata.xml
+++ b/dev-util/unicorn/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">unicorn-engine/unicorn</remote-id>
+		<remote-id type="pypi">unicorn</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild
index 01c1ff6ba6bf3..8b343753397dd 100644
--- a/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild
+++ b/dev-util/unicorn/unicorn-2.0.0_rc7.ebuild
@@ -7,7 +7,7 @@ MY_PV=${PV/_/-}
 
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake distutils-r1
 
 DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
@@ -39,7 +39,7 @@ UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x"
 wrap_python() {
 	if use python; then
 		# src_prepare
-		# do not compile C extensions
+		# Do not compile C extensions
 		export LIBUNICORN_PATH=1
 
 		pushd bindings/python >/dev/null || die