diff --git a/releng/CDT.setup b/releng/CDT.setup
index 1a03787e89b..ed0b18d57e4 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -37,7 +37,6 @@
   </setupTask>
   <setupTask
       xsi:type="setup:EclipseIniTask"
-      id=""
       option="-Xmx"
       value="1g"
       vm="true">
@@ -157,11 +156,9 @@
         <requirement
             name="org.freemarker"/>
         <requirement
-            name="org.bouncycastle.bcpkix"
-            versionRange="[1.51.0.v201505131810,1.51.0.v201505131810]"/>
+            name="org.bouncycastle.bcpkix"/>
         <requirement
-            name="org.bouncycastle.bcprov"
-            versionRange="[1.51.0.v201505131810,1.51.0.v201505131810]"/>
+            name="org.bouncycastle.bcprov"/>
         <requirement
             name="org.antlr.runtime"/>
         <requirement
@@ -205,7 +202,7 @@
           <repository
               url="http://download.eclipse.org/tm/updates/4.0/"/>
           <repository
-              url="http://download.eclipse.org/eclipse/updates/4.7milestones/"/>
+              url="http://download.eclipse.org/eclipse/updates/4.7/"/>
           <repository
               url="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
           <repository