diff --git a/pom.xml b/pom.xml
index d7bb94b..f28cfd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,10 +107,31 @@
 	</distributionManagement>
 	<profiles>
 		<profile>
-			<id>2019-09</id>
+			<id>2020-06</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>target-platform-configuration</artifactId>
+						<version>${tycho.version}</version>
+						<configuration>
+							<target>
+								<artifact>
+									<groupId>org.openjdk.jmc</groupId>
+									<artifactId>platform-definition-2020-06</artifactId>
+									<version>7.1.1-SNAPSHOT</version>
+								</artifact>
+							</target>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>2019-09</id>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/releng/platform-definitions/platform-definition-2018-09/platform-definition-2018-09.target b/releng/platform-definitions/platform-definition-2018-09/platform-definition-2018-09.target
index 93b37a8..a843bd3 100644
--- a/releng/platform-definitions/platform-definition-2018-09/platform-definition-2018-09.target
+++ b/releng/platform-definitions/platform-definition-2018-09/platform-definition-2018-09.target
@@ -35,7 +35,7 @@
 <target name="jmc-target-2018-09" sequenceNumber="47">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.5"/>
             <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
             <unit id="org.owasp.encoder" version="1.2.2"/>
             <unit id="org.twitter4j.core" version="4.0.7"/>
diff --git a/releng/platform-definitions/platform-definition-2018-12/platform-definition-2018-12.target b/releng/platform-definitions/platform-definition-2018-12/platform-definition-2018-12.target
index 06d1871..dee7024 100644
--- a/releng/platform-definitions/platform-definition-2018-12/platform-definition-2018-12.target
+++ b/releng/platform-definitions/platform-definition-2018-12/platform-definition-2018-12.target
@@ -35,7 +35,7 @@
 <target name="jmc-target-2018-12" sequenceNumber="47">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.5"/>
             <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
             <unit id="org.owasp.encoder" version="1.2.2"/>
             <unit id="org.twitter4j.core" version="4.0.7"/>
diff --git a/releng/platform-definitions/platform-definition-2019-03/platform-definition-2019-03.target b/releng/platform-definitions/platform-definition-2019-03/platform-definition-2019-03.target
index 9c5cba6..1c11942 100644
--- a/releng/platform-definitions/platform-definition-2019-03/platform-definition-2019-03.target
+++ b/releng/platform-definitions/platform-definition-2019-03/platform-definition-2019-03.target
@@ -35,7 +35,7 @@
 <target name="jmc-target-2019-03" sequenceNumber="47">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.5"/>
             <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
             <unit id="org.owasp.encoder" version="1.2.2"/>
             <unit id="org.twitter4j.core" version="4.0.7"/>
diff --git a/releng/platform-definitions/platform-definition-2019-06/platform-definition-2019-06.target b/releng/platform-definitions/platform-definition-2019-06/platform-definition-2019-06.target
index 98ed2b3..7f97f6a 100644
--- a/releng/platform-definitions/platform-definition-2019-06/platform-definition-2019-06.target
+++ b/releng/platform-definitions/platform-definition-2019-06/platform-definition-2019-06.target
@@ -35,7 +35,7 @@
 <target name="jmc-target-2019-06" sequenceNumber="47">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.5"/>
             <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
             <unit id="org.owasp.encoder" version="1.2.2"/>
             <unit id="org.twitter4j.core" version="4.0.7"/>
diff --git a/releng/platform-definitions/platform-definition-2019-09/platform-definition-2019-09.target b/releng/platform-definitions/platform-definition-2019-09/platform-definition-2019-09.target
index 707be3f..3edc1f9 100644
--- a/releng/platform-definitions/platform-definition-2019-09/platform-definition-2019-09.target
+++ b/releng/platform-definitions/platform-definition-2019-09/platform-definition-2019-09.target
@@ -35,7 +35,7 @@
 <target name="jmc-target-2019-09" sequenceNumber="47">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <unit id="com.sun.mail.jakarta.mail" version="1.6.3"/>
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.5"/>
             <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
             <unit id="org.owasp.encoder" version="1.2.2"/>
             <unit id="org.twitter4j.core" version="4.0.7"/>
diff --git a/releng/platform-definitions/platform-definition-2020-06/.project b/releng/platform-definitions/platform-definition-2020-06/.project
new file mode 100644
index 0000000..f801114
--- /dev/null
+++ b/releng/platform-definitions/platform-definition-2020-06/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>platform-definition-2020-06</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/platform-definitions/platform-definition-2020-06/platform-definition-2020-06.target b/releng/platform-definitions/platform-definition-2020-06/platform-definition-2020-06.target
new file mode 100644
index 0000000..55665b1
--- /dev/null
+++ b/releng/platform-definitions/platform-definition-2020-06/platform-definition-2020-06.target
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+   Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2020, Datadog, Inc. All rights reserved.
+
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   The contents of this file are subject to the terms of either the Universal Permissive License
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+
+   or the following license:
+
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<?pde version="3.8"?>
+<target name="jmc-target-2020-06" sequenceNumber="47">
+    <locations>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.sun.mail.jakarta.mail" version="1.6.5"/>
+            <unit id="com.sun.activation.jakarta.activation" version="1.2.1"/>
+            <unit id="org.owasp.encoder" version="1.2.2"/>
+            <unit id="org.twitter4j.core" version="4.0.7"/>
+            <unit id="org.hdrhistogram.HdrHistogram" version="2.1.11"/>
+            <unit id="org.adoptopenjdk.jemmy-awt-input" version="2.0.0"/>
+            <unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
+            <unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
+            <unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
+            <repository location="http://localhost:8080/site"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.800.v20200514-1529"/>
+            <unit id="org.eclipse.pde.feature.group" version="3.14.400.v20200604-0540"/>
+            <unit id="org.eclipse.platform.sdk" version="4.16.0.I20200604-0540"/>
+            <repository location="http://download.eclipse.org/releases/2020-06/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.16.0.v20201226013120"/>
+            <unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.16.0.v20201226013120"/>
+            <repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.2/2020-06/"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="com.make.chromium.cef.feature.feature.group" version="0.4.0.202005172227"/>
+            <repository location="https://equo-chromium-cef.ams3.digitaloceanspaces.com/rls/repository"/>
+        </location>
+    </locations>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
diff --git a/releng/platform-definitions/platform-definition-2020-06/pom.xml b/releng/platform-definitions/platform-definition-2020-06/pom.xml
new file mode 100644
index 0000000..5f11a5d
--- /dev/null
+++ b/releng/platform-definitions/platform-definition-2020-06/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2020, Datadog, Inc. All rights reserved.
+
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   The contents of this file are subject to the terms of either the Universal Permissive License
+   v 1.0 as shown at http://oss.oracle.com/licenses/upl
+
+   or the following license:
+
+   Redistribution and use in source and binary forms, with or without modification, are permitted
+   provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided with
+   the distribution.
+
+   3. Neither the name of the copyright holder nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+   FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+   WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.openjdk.jmc</groupId>
+		<artifactId>platform-definitions</artifactId>
+		<version>7.1.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>platform-definition-2020-06</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+
+	<properties>
+		<spotless.config.path>${basedir}/../../../configuration/ide/eclipse/formatting/formatting.xml</spotless.config.path>
+	</properties>
+</project>
diff --git a/releng/platform-definitions/pom.xml b/releng/platform-definitions/pom.xml
index 1ad845c..a3686ea 100644
--- a/releng/platform-definitions/pom.xml
+++ b/releng/platform-definitions/pom.xml
@@ -48,5 +48,6 @@
 		<module>platform-definition-2019-03</module>
 		<module>platform-definition-2019-06</module>
 		<module>platform-definition-2019-09</module>
+		<module>platform-definition-2020-06</module>
 	</modules>
 </project>
diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml
index 2ea4d20..99635cc 100644
--- a/releng/third-party/pom.xml
+++ b/releng/third-party/pom.xml
@@ -56,7 +56,7 @@
 									<id>org.twitter4j:twitter4j-core:4.0.7</id>
 								</artifact>
 								<artifact>
-									<id>com.sun.mail:jakarta.mail:1.6.3</id>
+									<id>com.sun.mail:jakarta.mail:1.6.5</id>
 									<override>true</override>
 									<instructions>
 										<Import-Package>*;resolution:=optional</Import-Package>