diff --git a/org.eclipse.xtext.xtext.generator/build.gradle b/org.eclipse.xtext.xtext.generator/build.gradle
index 08be31bde..4c67ab1a7 100644
--- a/org.eclipse.xtext.xtext.generator/build.gradle
+++ b/org.eclipse.xtext.xtext.generator/build.gradle
@@ -3,11 +3,19 @@ description = 'Generator for infrastructure of Xtext languages (supersedes org.e
 
 dependencies {
 	compile project(':org.eclipse.xtext')
-	compile 'org.eclipse.emf:org.eclipse.emf.codegen'
-	compile 'org.eclipse.emf:org.eclipse.emf.codegen.ecore'
+	compile('org.eclipse.emf:org.eclipse.emf.codegen') {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+	}
+	compile('org.eclipse.emf:org.eclipse.emf.codegen.ecore') {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.runtime'
+	}
 	compile 'org.eclipse.emf:org.eclipse.emf.mwe.utils'
 	compile 'org.eclipse.emf:org.eclipse.emf.mwe2.lib'
 	compile 'org.eclipse.platform:org.eclipse.equinox.common'
-	optional 'org.eclipse.platform:org.eclipse.core.runtime'
+	compile ('org.eclipse.platform:org.eclipse.core.runtime') {
+		exclude group: 'org.eclipse.platform', module: 'org.eclipse.equinox.common'
+	}
 	optional 'org.eclipse.jdt:org.eclipse.jdt.core'
 }
diff --git a/releng/pom.xml b/releng/pom.xml
index 998e7fd46..fc5232c34 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -12,7 +12,7 @@
 		<tycho-version>1.7.0</tycho-version>
 		<root-dir>${basedir}/..</root-dir>
 		<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
-		<upstreamBranch>master</upstreamBranch>
+		<upstreamBranch>cd_xtext_issue1976</upstreamBranch>
 	</properties>
 
 	<repositories>