diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
index ba821fdf805..819dc6175d8 100755
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ b/releng/org.eclipse.rse.build/nightly.sh
@@ -101,6 +101,7 @@ command="$command -DdoPublish=true "
 command="$command -Dbootclasspath=${bootclasspath} "
 command="$command -DJ2SE-1.4=${bootclasspath_14} "
 command="$command -DJ2SE-1.5=${bootclasspath_15} "
+command="$command -DJ2SE-1.6=${bootclasspath_16} "
 command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
 #command="$command postBuild "
 
diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
index cef686502e6..caece1d767b 100755
--- a/releng/org.eclipse.rse.build/setup.sh
+++ b/releng/org.eclipse.rse.build/setup.sh
@@ -50,15 +50,16 @@ esac
 #http://download.eclipse.org/eclipse/downloads/drops4/S-4.2RC1-201205182145/
 
 # prepare the base Eclipse installation in folder "eclipse"
-#ep_rel="drops4/S-"
-#ep_ver=4.2RC1
-#ep_date="-201205182145"
-ep_rel="drops/R-"
-ep_ver=3.7.2
-ep_date="-201202080800"
+ep_rel="drops4/S-"
+ep_ver=4.2RC1
+ep_date="-201205182145"
+#ep_rel="drops/R-"
+#ep_ver=3.7.2
+#ep_date="-201202080800"
 P2_disabled=false
 P2_no_dropins=false
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.7.2.v3740f.jar ]; then
+#if [ ! -f eclipse/plugins/org.eclipse.swt_3.7.2.v3740f.jar ]; then
+if [ ! -f eclipse/plugins/org.eclipse.swt_3.100.0.v4232.jar ]; then
   curdir2=`pwd`
   if [ ! -d eclipse -o -h eclipse ]; then
     if [ -d eclipse-${ep_ver}-${ep_arch} ]; then
@@ -140,18 +141,18 @@ if [ ! -f ${DROPIN}/org.sonatype.tycho.p2.updatesite_0.9.0.201005191712.jar ]; t
 fi
 
 # CDT Runtime
-#CDTREL=8.1.0
-#CDTFEAT=8.1.0
-#CDTVER=201205221655
-CDTREL=8.0.1
-CDTFEAT=8.0.0
-CDTVER=201109151620
+CDTREL=8.1.0
+CDTFEAT=8.1.0
+CDTVER=201205221655
+#CDTREL=8.0.1
+#CDTFEAT=8.0.0
+#CDTVER=201109151620
 #CDTNAME=cdt-master-${CDTREL}-I${CDTVER}.zip
 #CDTLOC=builds/${CDTREL}/I.I${CDTVER}/${CDTNAME}
-CDTNAME=cdt-master-${CDTREL}.zip
-CDTLOC=releases/indigo/dist/${CDTNAME}
-#CDTNAME=org.eclipse.cdt.repo.zip
-#CDTLOC=builds/juno/milestones/RC1/${CDTNAME}
+#CDTNAME=cdt-master-${CDTREL}.zip
+#CDTLOC=releases/indigo/dist/${CDTNAME}
+CDTNAME=org.eclipse.cdt.repo.zip
+CDTLOC=builds/juno/milestones/RC1/${CDTNAME}
 if [ ! -f eclipse/plugins/org.eclipse.cdt_${CDTFEAT}.${CDTVER}.jar ]; then
   echo "Getting CDT Runtime..."
   wget "http://download.eclipse.org/tools/cdt/${CDTLOC}"