diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 3cbcf2208f9..b03657253bd 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
-Bundle-Version: 6.4.0.qualifier
+Bundle-Version: 6.5.0.qualifier
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java
index 731f1b951de..aec81717ca2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTranslationUnit.java
@@ -133,7 +133,7 @@ public interface IASTTranslationUnit extends IASTDeclarationListOwner, IFileNomi
 	 * @param binding
 	 * @param permissive
 	 * @return Array of IASTName nodes for the binding's declaration
-	 * @since 6.4
+	 * @since 6.5
 	 */
 	public IASTName[] getDefinitionsInAST(IBinding binding, boolean permissive);
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java
index 472d150b289..6c8a1eb603e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java
@@ -68,7 +68,7 @@ public interface IIndex {
 	 * Constant to include potential matches in the results of a search.
 	 * An example of a potential match might be a function definition that does match
 	 * a declaration exactly in signature.
-	 * @since 6.4
+	 * @since 6.5
 	 */
 	final int FIND_POTENTIAL_MATCHES = 0x10;
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexName.java
index ebe96542b8d..c15d526f679 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexName.java
@@ -73,7 +73,7 @@ public interface IIndexName extends IName {
 	 * Returns whether this name is a potential match for its binding, rather than an exact match.
 	 * An example of a potential match might be a function definition that does match a
 	 * declaration exactly in signature.
-	 * @since 6.4
+	 * @since 6.5
 	 */
 	public boolean isPotentialMatch() throws CoreException;
 	
diff --git a/releng/CDT.setup b/releng/CDT.setup
index 23ad2d92abc..3ff6ff36343 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -75,7 +75,7 @@
         name="CDT"
         version="9.3"
         location="${workspace.location/../api.baseline}"
-        remoteURI="http://download.eclipse.org/tools/cdt/releases/9.3/cdt-9.3.3.zip"/>
+        remoteURI="http://download.eclipse.org/tools/cdt/releases/9.4/cdt-9.4.0/cdt-9.4.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 40dbaaa6833..42a4a2d909d 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -9,7 +9,6 @@
 <unit id="org.eclipse.cdt.debug.standalone.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.visualizer.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.core.lrparser.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.remote.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.docker.launcher.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.gnu.debug.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.platform.feature.group" version="0.0.0"/>
@@ -42,11 +41,10 @@
 <unit id="org.eclipse.cdt.native.source.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.core.parser.upc.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.gnu.dsf.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.cdt.util.feature.group" version="0.0.0"/>
 <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.3/cdt9.3.0/"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/9.4/cdt-9.4.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>