diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 71fe223..62fe097 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -1,14 +1,14 @@
-%global tag e_4_7_m_3_23_x
+%global tag R_3_23_2
 %global incubator_tag e9e79d9d73ec879d0db2b909014e6e1dce7ab806
-%global parentpomversion 3.23.0-SNAPSHOT
+%global parentpomversion 3.23.2-SNAPSHOT
 
 # Set this to avoid building with subclipse support
 %bcond_without subclipse
 
 Name:    eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
-Version: 3.23.1
-Release: 6%{?dist}
+Version: 3.23.2
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -269,6 +269,7 @@ rm org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.ui/src/org/eclipse/mylyn/in
 
 # Sources from non-tycho projects are usually not available in Fedora
 %pom_xpath_remove "plugin[@id='org.eclipse.mylyn.docs.epub.core.source']" org.eclipse.mylyn.docs/epub/ui/org.eclipse.mylyn.docs.epub.sdk-feature/feature.xml
+%pom_xpath_remove "plugin[@id='org.eclipse.mylyn.wikitext.asciidoc.source']" org.eclipse.mylyn.docs/wikitext/ui/org.eclipse.mylyn.wikitext.sdk-feature/feature.xml
 
 # Disable plugins we can live without (they are skipped by default anyway)
 %pom_remove_plugin -r :findbugs-maven-plugin
@@ -332,12 +333,15 @@ 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
-tasks_parent_gav="org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.23.1-SNAPSHOT"
+tasks_parent_gav="org.eclipse.mylyn.tasks:org.eclipse.mylyn.tasks-parent:3.23.2-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
+
+# Fix parent pom versions
 %pom_xpath_set pom:parent/pom:version "%{parentpomversion}" org.eclipse.mylyn.docs/docs/pom.xml
+%pom_xpath_set pom:parent/pom:version "%{parentpomversion}" org.eclipse.mylyn.versions/pom.xml
 
 # Be more tolerant for objenesis, gson and guava
 sed -i -e "/org.objenesis;bundle-version/s/1.0.0,2.0.0/1.0.0,3.0.0/g" $(find -name MANIFEST.MF)
@@ -447,6 +451,9 @@ install %{SOURCE6} \
 %files tests -f .mfiles-tests
 
 %changelog
+* Fri Dec 15 2017 Mat Booth <mat.booth@redhat.com> - 3.23.2-1
+- Update to latest upstream version
+
 * Wed Sep 27 2017 Mat Booth <mat.booth@redhat.com> - 3.23.1-6
 - Fix source fetching script
 
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index 8e8ce0b..6335433 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-BRANCH_NAME="e_4_7_m_3_23_x"
-WIKITEXT_TAG="wikitext.core-3.0.18"
+BRANCH_NAME="R_3_23_2"
+WIKITEXT_TAG="wikitext.core-3.0.19"
 FETCHED_SOURCES_NAME="eclipse-mylyn-${BRANCH_NAME}-fetched-src"
 
 #clean up old runs
@@ -16,20 +16,20 @@ git checkout ${BRANCH_NAME}
 git submodule update
 
 #checkout wikitext
-pushd org.eclipse.mylyn.docs
+pushd org.eclipse.mylyn.docs >/dev/null
 git checkout ${WIKITEXT_TAG}
-popd
+popd >/dev/null
 
 #checkout versions
-pushd org.eclipse.mylyn.versions
+pushd org.eclipse.mylyn.versions >/dev/null
 git checkout 600bd6cc19e394923692af6ff3dcf4c43f0aa911
-popd
+popd >/dev/null
 
 # 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{,.builds,.commons,.context,.reviews,.tasks} ; do
   pushd $i >/dev/null
     echo "Pull latest from ${BRANCH_NAME} into $i ... "
-    git pull origin ${BRANCH_NAME}
+    git checkout ${BRANCH_NAME}
   popd >/dev/null
 done
 
@@ -45,4 +45,4 @@ cd ..
 
 #package and clean up
 tar -caf ${FETCHED_SOURCES_NAME}.tar.xz ${FETCHED_SOURCES_NAME}
-# rm -rf ${FETCHED_SOURCES_NAME}
+rm -rf ${FETCHED_SOURCES_NAME}
diff --git a/sources b/sources
index 1de39b0..af27a4d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (eclipse-mylyn-e_4_7_m_3_23_x-fetched-src.tar.xz) = 53a36c649d5a2a5f2547e4eb9d75fe1249a28e5a9849fac95882ccec54c2da388ab5a989045fea9d02992084bfd3a3b4bf1ec3141de59b6dbe378fd588bbf35a
+SHA512 (eclipse-mylyn-R_3_23_2-fetched-src.tar.xz) = 7537607de6155c86f42cb4d29a660cd64e5cfe38d37101cb06ce608bc0520c919579fff295c0ff321a0c8d3909902c745625ec984e2e188031494fec5a5e3130
 SHA512 (eclipse-mylyn-e9e79d9d73ec879d0db2b909014e6e1dce7ab806-incubator-fetched-src.tar.xz) = 4a4c22745166efe581781cc672493f7fe67a9b26fbb19626e55ab3acd9488715c939aca7a3e17be7430b855e2a2ea228eee9dbb469038a5b51f895a5b4481d7b