diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index d44503181d3..9991e02aead 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -97,12 +97,12 @@
          id="org.eclipse.cdt.p2"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.cdt.debug.edc"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.tm.tcf.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.debug.edc"
+         version="0.0.0"/>
+
 </feature>
diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index eb0bbce4d6d..7fe2db54c5e 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -16,7 +16,7 @@
 export DISPLAY=:1
 
 # set up to use the Java 5 JRE
-export PATH=/opt/public/common/ibm-java-jdk-ppc-60/bin:/usr/local/bin:$PATH
+export PATH=/opt/public/common/ibm-java-ppc-605/bin:/usr/local/bin:$PATH
 
 # make sure we're in the releng project dir 
 cd `dirname $0`
diff --git a/releng/org.eclipse.cdt.releng/myscp b/releng/org.eclipse.cdt.releng/myscp
deleted file mode 100644
index ff9680b2731..00000000000
--- a/releng/org.eclipse.cdt.releng/myscp
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/expect -f
-
-set passwd [lindex $argv 0]
-set timeout 6000
-
-set id [eval spawn scp -qp [lrange $argv 1 end]]
-expect "Password:" { send "$passwd\r" }
-expect