diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
index b3a7159..fcd620d 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
@@ -1,56 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Neon SDK" sequenceNumber="1472568682">
-  <locations>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-      <repository location="http://download.eclipse.org/cbi/updates/license"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
-      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
-      <unit id="org.junit" version="4.12.0.v201504281640"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="javaewah" version="0.7.9.v201401101600"/>
-      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
-      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
-      <unit id="org.mockito" version="1.9.5.v201311280930"/>
-      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/egit/updates-nightly"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
-      <repository location="http://axelrichard.github.io/fr.obeo.performance/"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sirius" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/sirius/updates/nightly/latest/neon"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.obeonetwork.dsl.uml2.runtime.feature.feature.group" version="0.0.0"/>
-      <repository location="http://obeo-umldesigner-nightly.s3-website-eu-west-1.amazonaws.com/master/repository"/>
-    </location>
-  </locations>
+<?pde version="3.8"?><target name="EMF Compare based on Neon SDK" sequenceNumber="1465997959">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<unit id="com.google.gson" version="2.2.4.v201311231704"/>
+<unit id="org.junit" version="4.12.0.v201504281640"/>
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="javaewah" version="0.7.9.v201401101600"/>
+<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+<unit id="org.mockito" version="1.9.5.v201311280930"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/egit/updates-nightly"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+<repository location="http://obeo.github.io/fr.obeo.performance/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/acceleo/updates/releases/3.6"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.sirius" version="0.0.0"/>
+<unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/sirius/updates/nightly/4.1.x/neon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.obeonetwork.dsl.uml2.runtime.feature.feature.group" version="0.0.0"/>
+<repository location="http://obeo-umldesigner-releases.s3-website-eu-west-1.amazonaws.com/7.1.0/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/"/>
+</location>
+</locations>
 </target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd
index e27012e..1cf3e79 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd
@@ -2,7 +2,6 @@
 
 include "fragments/licence.tpd"
 include "fragments/orbit.tpd"
-include "fragments/egit-nightly.tpd"
 include "fragments/perf.tpd"
 
 with source, requirements
@@ -16,18 +15,23 @@
 	org.eclipse.emf.ecoretools.sdk.feature.group lazy
 	org.eclipse.papyrus.sdk.feature.feature.group lazy
 	org.eclipse.team.svn.feature.group lazy
+	org.eclipse.egit.feature.group lazy
 }
 
-location "http://download.eclipse.org/acceleo/updates/nightly/latest" {
+location "http://download.eclipse.org/acceleo/updates/releases/3.6" {
 	org.eclipse.acceleo.feature.group lazy
 	org.eclipse.acceleo.query.feature.group lazy
 }
 
-location "http://download.eclipse.org/sirius/updates/nightly/latest/neon" {
+location "http://download.eclipse.org/sirius/updates/nightly/4.1.x/neon" {
 	org.eclipse.sirius lazy
 	org.eclipse.sirius.runtime.acceleo.feature.group lazy
 }
 
-location "http://obeo-umldesigner-nightly.s3-website-eu-west-1.amazonaws.com/master/repository" {
+location "http://obeo-umldesigner-releases.s3-website-eu-west-1.amazonaws.com/7.1.0/repository" {
 	org.obeonetwork.dsl.uml2.runtime.feature.feature.group lazy
 }
+
+location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/" {
+	org.eclipse.papyrus.sysml.feature.feature.group lazy
+}