diff --git a/dev-python/sip/files/sip-6.13.1-pyqt5.patch b/dev-python/sip/files/sip-6.13.1-pyqt5.patch
new file mode 100644
index 0000000000000..41f889198bb78
--- /dev/null
+++ b/dev-python/sip/files/sip-6.13.1-pyqt5.patch
@@ -0,0 +1,13 @@
+https://github.com/Python-SIP/sip/issues/95
+https://github.com/Python-SIP/sip/commit/b6a7ec2453899
+--- a/sipbuild/generator/resolver/resolver.py
++++ b/sipbuild/generator/resolver/resolver.py
+@@ -39,4 +39,8 @@
+         mod.py_name = mod.fq_py_name.name.split('.')[-1]
+ 
++    # There is nothing else that needs doing for composite modules.
++    if spec.is_composite:
++        return
++
+     # Set the default meta-type for the main module if it doesn't have one
+     # explicitly set.
diff --git a/dev-python/sip/sip-6.13.1.ebuild b/dev-python/sip/sip-6.13.1-r1.ebuild
similarity index 90%
rename from dev-python/sip/sip-6.13.1.ebuild
rename to dev-python/sip/sip-6.13.1-r1.ebuild
index b3cdd6e2f991a..aecd970ae3b64 100644
--- a/dev-python/sip/sip-6.13.1.ebuild
+++ b/dev-python/sip/sip-6.13.1-r1.ebuild
@@ -16,8 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2 BSD"
 SLOT="5"
-# https://github.com/Python-SIP/sip/issues/95
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
@@ -34,6 +33,10 @@ distutils_enable_sphinx docs \
 EPYTEST_PLUGINS=()
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pyqt5.patch
+)
+
 python_test() {
 	# some tests currently fails to find test/utils without this
 	# TODO: try again without, used to be unneeded but not been looked into