diff --git a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
index 09cfe30dcac62..796d357d7e172 100644
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
@@ -13,7 +13,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Jakarta Mail API 2.1 Specification API"
-HOMEPAGE="https://projects.eclipse.org/projects/ee4j/jakarta.mail-api"
+HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
 SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
diff --git a/dev-java/jakarta-mail-api/metadata.xml b/dev-java/jakarta-mail-api/metadata.xml
index 6410093e5ffea..bb9bcf723eb64 100644
--- a/dev-java/jakarta-mail-api/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@@ -7,4 +7,7 @@
 	<longdescription>
 		Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/mail</remote-id>
+	</upstream>
 </pkgmetadata>