diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
index 9cf33ca150a..143ca0ab3a1 100755
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
@@ -28,8 +28,9 @@ cd `dirname $0`
 mydir=`pwd`
 echo ${mydir}
 
-#Use Java5 on build.eclipse.org
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
+#Use Java6 on build.eclipse.org since CDT .core needs Java 6
+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
 
 
 #Get parameters
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
index dc880400cab..5f4973d20d8 100755
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
@@ -14,10 +14,9 @@
 #nothing we do should be hidden from the world
 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
+#Use Java6 on build.eclipse.org since CDT .core needs Java 6
+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=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
 
 curdir=`pwd`