diff --git a/.project b/.project
new file mode 100644
index 00000000000..d3a94771890
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.root</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/pom.xml b/pom.xml
index 5a8548cc2ea..678c6f2e255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 
 		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl>
 		<base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs>
-		<comparator.repo>https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.0/</comparator.repo>
+		<comparator.repo>https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.1-2020-06-rc1</comparator.repo>
 		<!-- these parameters are to control baseline replace and compare. On a local build you want
 		     to avoid baseline replace and compare, especially if you have different versions of Java than
 			 the baseline was built with. This is the default.
diff --git a/releng/CDT.setup b/releng/CDT.setup
index 063356d2acc..d23a98319af 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -256,7 +256,7 @@
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.16/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.17milestones/S-4.17M1-202007081800/"/>
           <repository
               url="https://download.eclipse.org/egit/updates/"/>
           <repository
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 3a1b34dc83c..6a034fc14e6 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="84">
+<target name="cdt" sequenceNumber="85">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -11,7 +11,7 @@
 <unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.16/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.17milestones/S-4.17M1-202007081800/"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="https://download.eclipse.org/egit/updates"/>