diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 91da8ca..71fe223 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -8,7 +8,7 @@
 Name:    eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.23.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -332,10 +332,11 @@ sed -i -e "/<sourceReferences>/,+3d" org.eclipse.mylyn/org.eclipse.mylyn-parent/
 sed -i -e "s@<addMavenDescriptor>false<@<addMavenDescriptor>true<@" org.eclipse.mylyn/org.eclipse.mylyn-parent/pom.xml
 
 # Integrate incubator bundles
-%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{parentpomversion} org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml
-%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{parentpomversion} org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml
-%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{parentpomversion} org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml
-%pom_set_parent org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:%{parentpomversion} org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml
+tasks_parent_gav="org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.23.1-SNAPSHOT"
+%pom_set_parent $tasks_parent_gav org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki/pom.xml
+%pom_set_parent $tasks_parent_gav org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.wiki-feature/pom.xml
+%pom_set_parent $tasks_parent_gav org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks/pom.xml
+%pom_set_parent $tasks_parent_gav org.eclipse.mylyn.tasks/org.eclipse.mylyn.web.tasks-feature/pom.xml
 %pom_xpath_set pom:parent/pom:version "%{parentpomversion}" org.eclipse.mylyn.docs/docs/pom.xml
 
 # Be more tolerant for objenesis, gson and guava
@@ -360,6 +361,7 @@ sed -i -e '/Require-/a\ org.eclipse.jdt.core,' org.eclipse.mylyn.context/org.ecl
 %mvn_package "org.eclipse.mylyn.builds:" builds
 %mvn_package "org.eclipse.mylyn.context:*cdt.mylyn*" context-cdt
 %mvn_package "org.eclipse.mylyn.context:*mylyn.pde*" context-pde
+%mvn_package "org.eclipse.mylyn.context*:*.team.cvs" context-pde
 %mvn_package "org.eclipse.mylyn.context:*{java_feature,java.tasks,java.ui,ide.ant,debug.ui}*" context-java
 %mvn_package "org.eclipse.mylyn.docs:*epub*" docs-epub
 %mvn_package "org.eclipse.mylyn.docs:" docs
@@ -445,6 +447,9 @@ install %{SOURCE6} \
 %files tests -f .mfiles-tests
 
 %changelog
+* Wed Sep 27 2017 Mat Booth <mat.booth@redhat.com> - 3.23.1-6
+- Fix source fetching script
+
 * Tue Sep 26 2017 Mat Booth <mat.booth@redhat.com> - 3.23.1-5
 - Add missing BR and rebuild to generate symlinks
 
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index c261684..8e8ce0b 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -9,7 +9,7 @@ FETCHED_SOURCES_NAME="eclipse-mylyn-${BRANCH_NAME}-fetched-src"
 #clean up old runs
 rm -rf ${FETCHED_SOURCES_NAME}
 
-#checkout
+# checkout aggregator repo
 git clone --recursive git://git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.all.git ${FETCHED_SOURCES_NAME}
 cd ${FETCHED_SOURCES_NAME}
 git checkout ${BRANCH_NAME}
@@ -20,17 +20,22 @@ pushd org.eclipse.mylyn.docs
 git checkout ${WIKITEXT_TAG}
 popd
 
-#remove precompiled binaries
-find . -type f -name "*.class" -o -name "*.jar" -exec rm {} \;
+#checkout versions
+pushd org.eclipse.mylyn.versions
+git checkout 600bd6cc19e394923692af6ff3dcf4c43f0aa911
+popd
 
 # update from BRANCH_NAME branch to get latest - note that org.eclipse.mylyn.versions and org.eclipse.mylyn.docs don't have this branch
-for i in org.eclipse.mylyn*; do
+for i in org.eclipse.mylyn{,.builds,.commons,.context,.reviews,.tasks} ; do
   pushd $i >/dev/null
     echo "Pull latest from ${BRANCH_NAME} into $i ... "
     git pull origin ${BRANCH_NAME}
   popd >/dev/null
 done
 
+# remove precompiled binaries
+find . -type f -name "*.class" -o -name "*.jar" -exec rm {} \;
+
 # purge git metadata
 rm -rf .git
 find . -type f -name ".gitignore" -exec rm {} \;
diff --git a/sources b/sources
index 8092087..1de39b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (eclipse-mylyn-e_4_7_m_3_23_x-fetched-src.tar.xz) = f8e7785733bad2cd14ebd1de80d0caa9d4ba33c909c29aa6d738cf3d7badc1a2d842ea9ccdb56a6e8b5d3d250076fa34616555bc382dd10de2f333b48b496ef4
+SHA512 (eclipse-mylyn-e_4_7_m_3_23_x-fetched-src.tar.xz) = 53a36c649d5a2a5f2547e4eb9d75fe1249a28e5a9849fac95882ccec54c2da388ab5a989045fea9d02992084bfd3a3b4bf1ec3141de59b6dbe378fd588bbf35a
 SHA512 (eclipse-mylyn-e9e79d9d73ec879d0db2b909014e6e1dce7ab806-incubator-fetched-src.tar.xz) = 4a4c22745166efe581781cc672493f7fe67a9b26fbb19626e55ab3acd9488715c939aca7a3e17be7430b855e2a2ea228eee9dbb469038a5b51f895a5b4481d7b