diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index e4fe12d5b61f3..ab5c5e686f178 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -16,6 +16,7 @@
 	<slots>
 		<slot name="8">Java™ 8 is Java™ 1.8, where 8 is the version number, and 1.8 is the version string</slot>
 		<slot name="11">Java™ version 11</slot>
+		<slot name="17">Java™ version 17</slot>
 	</slots>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
@@ -27,4 +28,9 @@
 		<flag name="system-bootstrap">Bootstrap using installed openjdk</flag>
 		<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">openjdk/jdk8u</remote-id>
+		<remote-id type="github">openjdk/jdk11u</remote-id>
+		<remote-id type="github">openjdk/jdk17u</remote-id>
+	</upstream>
 </pkgmetadata>