diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index d420171bf1c..4cd2cad4d1d 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -25,7 +25,7 @@ cd `dirname $0`
 # Checkout basebuilder to run the build
 mkdir -p tools
 cd tools
-cvs -d /cvsroot/eclipse	co -r R36_RC1 org.eclipse.releng.basebuilder
+cvs -d /cvsroot/eclipse	co -r R36_RC4 org.eclipse.releng.basebuilder
 cp /home/data/httpd/download.eclipse.org/technology/subversive/0.7/pde-update-site/plugins/org.eclipse.team.svn.pde.build_0.7.8.I20090525-1500.jar \
 	org.eclipse.releng.basebuilder/plugins
 cd ..
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 21f77b49267..d2479b79090 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -153,13 +153,13 @@ plugin@org.eclipse.cdt.scripting=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/edc/or
 feature@org.eclipse.cdt.debug.edc=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/edc/org.eclipse.cdt.debug.edc-feature
 
 ! TCF Requirements for EDC
-plugin@org.eclipse.tm.tcf=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf
-plugin@org.eclipse.tm.tcf.cdt.ui=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.cdt.ui
-plugin@org.eclipse.tm.tcf.core=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.core
-plugin@org.eclipse.tm.tcf.debug=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.debug
-plugin@org.eclipse.tm.tcf.debug.ui=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.debug.ui
-plugin@org.eclipse.tm.tcf.rse=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.rse
-feature@org.eclipse.tm.tcf.feature=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/features/org.eclipse.tm.tcf.feature
+plugin@org.eclipse.tm.tcf=SVN,url=http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf
+plugin@org.eclipse.tm.tcf.cdt.ui=SVN,url=http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.cdt.ui
+plugin@org.eclipse.tm.tcf.core=SVN,url=http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.core
+plugin@org.eclipse.tm.tcf.debug=SVN,url=http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.debug
+plugin@org.eclipse.tm.tcf.debug.ui=SVN,url=http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.debug.ui
+plugin@org.eclipse.tm.tcf.rse=SVN,url=http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/plugins/org.eclipse.tm.tcf.rse
+feature@org.eclipse.tm.tcf.feature=SVN,url=http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=tags,path=0.3.0/features/org.eclipse.tm.tcf.feature
 
 ! Berkeley UPC
 plugin@org.eclipse.cdt.managedbuilder.bupc.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.managedbuilder.bupc.ui