diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index dad4ffbd59a..aec32b151d9 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -141,7 +141,7 @@
                 <tm-stream>juno</tm-stream>
                 <sdk-version>3.8</sdk-version>
                 <platform-site>http://download.eclipse.org/eclipse/updates/${sdk-version}</platform-site>
-                <cdt-site>http://download.eclipse.org/tools/cdt/releases/juno</cdt-site>
+                <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.4</cdt-site>
             </properties>
         </profile>
         <profile>
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF
index 93c9461dc80..40001a3a2c0 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.connector.local/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.tm.terminal.connector.local.activator.UIPlugin
 Bundle-Vendor: %providerName
 Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native
-Require-Bundle: org.eclipse.cdt.core;bundle-version="5.4.1";resolution:=optional,
+Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.8.0",
diff --git a/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF
index 969388c9475..63779afa3d6 100644
--- a/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.connector.process/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.tm.terminal.connector.process.activator.UIPlugin
 Bundle-Vendor: %providerName
 Import-Package: org.eclipse.cdt.utils.pty;mandatory:=native,
  org.eclipse.cdt.utils.spawner;mandatory:=native
-Require-Bundle: org.eclipse.cdt.core;bundle-version="5.4.1";resolution:=optional,
+Require-Bundle: org.eclipse.cdt.core;bundle-version="5.6.0";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="3.4.400",
  org.eclipse.core.resources;bundle-version="3.8.1";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.8.0",