diff --git a/Jenkinsfile b/Jenkinsfile
index 99267c5c8..5947dadd1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,20 +1,27 @@
 // tell Jenkins how to build projects from this repository
 node {
 	try {
-		
 		stage 'Checkout'
 		checkout scm
-			
-		stage 'Build'
-		sh "./gradlew -PuseJenkinsSnapshots=true cleanLocalMavenRepo clean build createLocalMavenRepo --refresh-dependencies --continue"
-		archive 'build/maven-repository/**/*.*'
+		
+		stage 'Gradle Build'
+        try {
+			sh "./gradlew -PuseJenkinsSnapshots=true cleanLocalMavenRepo cleanLocalP2Repo clean build createLocalMavenRepo --refresh-dependencies --continue"
+			archive 'build/maven-repository/**/*.*'
+		} finally {
+			step([$class: 'JUnitResultArchiver', testResults: '**/build/test-results/test/*.xml'])
+		}
+		
+		stage 'Maven Build'
+        def mvnHome = tool 'M3'
+        env.M2_HOME = "${mvnHome}"
+        sh "${mvnHome}/bin/mvn -f releng/pom.xml --batch-mode --update-snapshots clean install"
+        archive 'build/**/*.*'
 		
 		slackSend "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
 		
 	} catch (e) {
 		slackSend color: 'danger', message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)"
 		throw e
-	} finally {
-		step([$class: 'JUnitResultArchiver', testResults: '**/build/test-results/test/*.xml'])
 	}
 }
\ No newline at end of file
diff --git a/releng/.gitignore b/releng/.gitignore
new file mode 100644
index 000000000..2f7896d1d
--- /dev/null
+++ b/releng/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/releng/p2/category.xml b/releng/p2/category.xml
new file mode 100644
index 000000000..7207daa84
--- /dev/null
+++ b/releng/p2/category.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+	<bundle id="org.eclipse.xtext" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.ide" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.ide.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.ide.tests" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.ide.tests.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.testing" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.testing.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.testlanguages" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.testlanguages.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.testlanguages.ide" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.testlanguages.ide.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.tests" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.tests.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.util" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.util.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.xtext.generator" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.xtext.generator.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.xtext.wizard" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+	<bundle id="org.eclipse.xtext.xtext.wizard.source" version="2.11.0.qualifier">
+		<category name="xtext-core"/>
+	</bundle>
+   <category-def name="xtext-core" label="Xtext-core"/>
+</site>
diff --git a/releng/p2/pom.xml b/releng/p2/pom.xml
new file mode 100644
index 000000000..1f40998c1
--- /dev/null
+++ b/releng/p2/pom.xml
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>xtext-core.p2-repository</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<parent>
+		<groupId>org.eclipse.xtext</groupId>
+		<artifactId>xtext-core.releng</artifactId>
+		<version>2.11.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<properties>
+		<tycho-version>0.25.0</tycho-version>
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>assemble-repository</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.1</version>
+				<executions>
+					<execution>
+						<phase>install</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<copy todir="${basedir}/../../build/p2-repository">
+									<fileset dir="${basedir}/target/repository/" />
+								</copy>
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/releng/pom.xml b/releng/pom.xml
new file mode 100644
index 000000000..38bfe91b1
--- /dev/null
+++ b/releng/pom.xml
@@ -0,0 +1,188 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.xtext</groupId>
+	<artifactId>xtext-core.releng</artifactId>
+	<version>2.11.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<properties>
+		<tycho-version>0.25.0</tycho-version>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>local-gradle-result</id>
+			<url>file:${basedir}/../build/maven-repository</url>
+		</repository>
+		<repository>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<id>jcenter</id>
+			<url>http://jcenter.bintray.com</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.ide</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.ide</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.ide.tests</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.ide.tests</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.testing</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.testing</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.testlanguages</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.testlanguages</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.testlanguages.ide</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.testlanguages.ide</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.tests</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.tests</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.util</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.util</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.xtext.wizard</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.xtext</groupId>
+			<artifactId>org.eclipse.xtext.xtext.wizard</artifactId>
+			<version>2.11.0-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+	</dependencies>
+
+	<modules>
+		<module>releng-target</module>
+		<module>p2</module>
+	</modules>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<pomDependencies>consider</pomDependencies>
+					<target>
+						<artifact>
+							<groupId>org.eclipse.xtext</groupId>
+							<artifactId>xtext-core.target</artifactId>
+							<version>2.11.0-SNAPSHOT</version>
+						</artifact>
+					</target>
+					<environments>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/releng/releng-target/pom.xml b/releng/releng-target/pom.xml
new file mode 100644
index 000000000..214eb1a02
--- /dev/null
+++ b/releng/releng-target/pom.xml
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>xtext-core.target</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+
+	<parent>
+		<groupId>org.eclipse.xtext</groupId>
+		<artifactId>xtext-core.releng</artifactId>
+		<version>2.11.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+</project>
diff --git a/releng/releng-target/xtext-core.target.target b/releng/releng-target/xtext-core.target.target
new file mode 100644
index 000000000..b7a678a15
--- /dev/null
+++ b/releng/releng-target/xtext-core.target.target
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.8"?>
+<target name="org.eclipse.xtext.helios.target" sequenceNumber="0">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+			<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+			<repository location="http://download.eclipse.org/releases/luna/201502271000/"/>
+		</location>
+	</locations>
+</target>