diff --git a/dev-python/openapi-spec-validator/metadata.xml b/dev-python/openapi-spec-validator/metadata.xml
index be2432aed5c9f..eb0b0955d0898 100644
--- a/dev-python/openapi-spec-validator/metadata.xml
+++ b/dev-python/openapi-spec-validator/metadata.xml
@@ -6,7 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">p1c2u/openapi-spec-validator</remote-id>
+		<remote-id type="github">python-openapi/openapi-spec-validator</remote-id>
 		<remote-id type="pypi">openapi-spec-validator</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
index 4711abc587ebb..02d0efe87dbed 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
@@ -10,11 +10,11 @@ inherit distutils-r1
 
 DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
 HOMEPAGE="
-	https://github.com/p1c2u/openapi-spec-validator/
+	https://github.com/python-openapi/openapi-spec-validator/
 	https://pypi.org/project/openapi-spec-validator/
 "
 SRC_URI="
-	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
+	https://github.com/python-openapi/openapi-spec-validator/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "