diff --git a/dev-java/validation-api/metadata.xml b/dev-java/validation-api/metadata.xml
index 4221e170cbc00..8d626a41d89c0 100644
--- a/dev-java/validation-api/metadata.xml
+++ b/dev-java/validation-api/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/beanvalidation-api</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
index d7887694dca4b..316ac36886b44 100644
--- a/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+HOMEPAGE="https://beanvalidation.org/"
 SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
index 25f7a00c3bf01..1f63794e937bf 100644
--- a/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
+++ b/dev-java/validation-api/validation-api-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Bean Validation (JSR-303) API"
-HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+HOMEPAGE="https://beanvalidation.org/"
 SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar"
 
 LICENSE="Apache-2.0"