diff --git a/releng/CDT.setup b/releng/CDT.setup
index fe3f4f7f9a2..8a5de80fc2f 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -73,9 +73,9 @@
         xsi:type="pde:APIBaselineTask"
         id="baseline"
         name="CDT"
-        version="9.4"
+        version="9.5"
         location="${workspace.location/../api.baseline}"
-        remoteURI="http://download.eclipse.org/tools/cdt/releases/9.4/cdt-9.4.0/cdt-9.4.0.zip"/>
+        remoteURI="http://download.eclipse.org/tools/cdt/releases/9.5/cdt-9.5.0/cdt-9.5.0.zip"/>
     <setupTask
         xsi:type="git:GitCloneTask"
         id="git.clone.cdt"
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 42a4a2d909d..17fad03df42 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt-baseline" sequenceNumber="12">
+<?pde version="3.8"?><target name="cdt-baseline" sequenceNumber="13">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.build.source.feature.group" version="0.0.0"/>
@@ -44,15 +44,15 @@
 <unit id="org.eclipse.cdt.autotools.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
 <unit id="org.eclipse.tools.templates.ui" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/9.4/cdt-9.4.0/"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/9.5/cdt-9.5.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/launchbar/oxygen/"/>
+<repository location="http://download.eclipse.org/tools/cdt/launchbar/photon/m7/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/releases/oxygen/201706281000/"/>
+<repository location="http://download.eclipse.org/releases/photon/"/>
 </location>
 </locations>
 </target>