diff --git a/releng/CDT.setup b/releng/CDT.setup
index a6ed33d8079..dcbe7620e8c 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -67,16 +67,16 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="Mars"
+      defaultValue="Neon"
       storageURI="scope://Workspace"/>
   <stream name="master">
     <setupTask
         xsi:type="pde:APIBaselineTask"
         id="baseline"
         name="CDT"
-        version="8.7"
+        version="8.8"
         location="${workspace.location/../api.baseline}"
-        remoteURI="http://download.eclipse.org/tools/cdt/releases/8.7/cdt-8.7.0.zip"/>
+        remoteURI="http://download.eclipse.org/tools/cdt/releases/8.8/cdt-8.8.0.zip"/>
     <setupTask
         xsi:type="git:GitCloneTask"
         id="git.clone.cdt"
@@ -150,13 +150,17 @@
             name="org.eclipse.launchbar.feature.group"/>
         <requirement
             name="org.eclipse.linuxtools.docker.feature.feature.group"/>
+        <requirement
+            name="org.freemarker"/>
+        <requirement
+            name="org.antlr.runtime"/>
         <sourceLocator
             rootFolder="${git.clone.cdt.location}"
             locateNestedProjects="true"/>
         <repositoryList
             name="Mars">
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
           <repository
               url="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
           <repository
@@ -177,7 +181,7 @@
         <repositoryList
             name="Neon">
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
           <repository
               url="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
           <repository
@@ -194,6 +198,8 @@
               url="https://hudson.eclipse.org/cdt/job/launchbar-master/lastSuccessfulBuild/artifact/repo/target/repository/"/>
           <repository
               url="http://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
+          <repository
+              url="https://hudson.eclipse.org/orbit/job/orbit-recipes/lastSuccessfulBuild/artifact/releng/repository/target/repository"/>
         </repositoryList>
       </targlet>
     </setupTask>