diff --git a/releng/org.eclipse.cdt.releng/build.sh b/releng/org.eclipse.cdt.releng/build.sh
index b791dfaaa46..79e757811d3 100644
--- a/releng/org.eclipse.cdt.releng/build.sh
+++ b/releng/org.eclipse.cdt.releng/build.sh
@@ -12,11 +12,34 @@ umask 0022
 
 cd `dirname $0`
 
+# Checkout basebuilder to run the build
 mkdir -p tools
 cd tools
 cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse \
 	checkout -r M5_34 org.eclipse.releng.basebuilder
 cd ..
 
+# Mylyn build dependencies
+set mylynTag=R_2_3_2
+mkdir -p mylyn
+cd mylyn
+cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
+	checkout -r $mylynTag org.eclipse.mylyn/org.eclipse.mylyn.context.core
+cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
+	checkout -r $mylynTag org.eclipse.mylyn/org.eclipse.mylyn.context.ui
+cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
+	checkout -r $mylynTag org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
+cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
+	checkout -r $mylynTag org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
+cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
+	checkout -r $mylynTag org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
+cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
+	checkout -r $mylynTag org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
+cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
+	checkout -r $mylynTag org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui
+cd ..
+mkdir -p results/plugins
+mv mylyn/org.eclipse/mylyn/* results/plugins
+
 java -jar tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
 	-ws gtk -arch ppc -os linux -application org.eclipse.ant.core.antRunner $*
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index bf4984e3261..47df046cb8a 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -85,12 +85,3 @@ feature@org.eclipse.cdt.util=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroo
 plugin@org.eclipse.cdt.mylyn=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/mylyn/org.eclipse.cdt.mylyn
 plugin@org.eclipse.cdt.mylyn.ui=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/mylyn/org.eclipse.cdt.mylyn.ui
 feature@org.eclipse.cdt.mylyn=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/mylyn/org.eclipse.cdt.mylyn-feature
-
-! Mylyn build dependencies (not included in CDT feature but we need to check these out)
-plugin@org.eclipse.mylyn.context.core=R_2_3_2,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.core
-plugin@org.eclipse.mylyn.context.ui=R_2_3_2,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.context.ui
-plugin@org.eclipse.mylyn.monitor.core=R_2_3_2,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.core
-plugin@org.eclipse.mylyn.monitor.ui=R_2_3_2,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui
-plugin@org.eclipse.mylyn.resources.ui=R_2_3_2,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.resources.ui
-plugin@org.eclipse.mylyn.tasks.core=R_2_3_2,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.core
-plugin@org.eclipse.mylyn.tasks.ui=R_2_3_2,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui