diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
index 0e2fd929ae0..fc308c829d7 100755
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
@@ -30,8 +30,8 @@ echo ${mydir}
 
 #Use Java5 on build.eclipse.org
 #export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
-#export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
+export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
+#export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
 #export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
 
 
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
index 4041fc1c4f6..dc880400cab 100755
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
@@ -16,8 +16,8 @@ umask 22
 
 #Use Java5 on build.eclipse.org
 #export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
-#export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
+export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
+#export PATH=/shared/tools/tm/jdk-1.6/jre/bin:/shared/tools/tm/jdk-1.6/bin:$PATH
 #export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
 
 curdir=`pwd`
diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh
index 9566b8a0dcb..3993cb87db2 100755
--- a/releng/org.eclipse.rse.build/go.sh
+++ b/releng/org.eclipse.rse.build/go.sh
@@ -51,6 +51,7 @@ bootclasspath_15="/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar"
 bootclasspath_16="/shared/tools/tm/jdk-1.6/jre/lib/rt.jar"
 #bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
 bootclasspath_foundation11="/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
+bootclasspath=${bootclasspath_14}
 
 command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
 command="$command -application org.eclipse.ant.core.antRunner "
@@ -70,7 +71,7 @@ command="$command -DfetchTag=HEAD "
 command="$command -DskipFetch "
 command="$command -Dmydstamp=${mydstamp} "
 command="$command -Dmytstamp=${mytstamp} "
-#command="$command -Dbootclasspath=${bootclasspath_16} "
+#command="$command -Dbootclasspath=${bootclasspath} "
 #command="$command -DJ2SE-1.4=${bootclasspath_14} "
 #command="$command -DJ2SE-1.5=${bootclasspath_15} "
 #command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
index 330ad35c887..a79b907ec2e 100755
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ b/releng/org.eclipse.rse.build/nightly.sh
@@ -76,7 +76,7 @@ bootclasspath_15="/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar"
 bootclasspath_16="/shared/tools/tm/jdk-1.6/jre/lib/rt.jar"
 #bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
 bootclasspath_foundation11="/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
-
+bootclasspath=${bootclasspath_14}
 
 command="java -cp ${basebuilder}/plugins/${launcher} org.eclipse.core.launcher.Main "
 command="$command -application org.eclipse.ant.core.antRunner "
@@ -97,7 +97,7 @@ if [ "$buildType" = "N" ]; then
   command="$command -DfetchTag=HEAD "
 fi
 command="$command -DdoPublish=true "
-command="$command -Dbootclasspath=${bootclasspath_16} "
+command="$command -Dbootclasspath=${bootclasspath} "
 command="$command -DJ2SE-1.4=${bootclasspath_14} "
 command="$command -DJ2SE-1.5=${bootclasspath_15} "
 command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "