diff --git a/features/org.eclipse.papyrus.ease.feature/feature.xml b/features/org.eclipse.papyrus.ease.feature/feature.xml
index 76a11af..f570baf 100644
--- a/features/org.eclipse.papyrus.ease.feature/feature.xml
+++ b/features/org.eclipse.papyrus.ease.feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.papyrus.ease.feature"
-      version="0.7.0.qualifier"
       label="%featureName"
+      version="0.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.0">
@@ -10,7 +10,7 @@
    <description url="http://www.example.com/description">
       %description
    </description>
-   
+
    <copyright>
       %copyright
    </copyright>
@@ -19,8 +19,31 @@
       %license
    </license>
 
+   <includes
+         id="org.eclipse.ease.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ease.lang.python.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ease.lang.python.py4j.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ease.modules.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ease.modules.modeling.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.ease.ui.feature"
+         version="0.0.0"/>
+
    <requires>
-	  <import feature="org.eclipse.ease.modules.modeling.feature" version="0.7.0" match="compatible"/>
       <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.core.expressions" version="3.6.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.13.0" match="compatible"/>
@@ -36,19 +59,18 @@
       <import plugin="org.eclipse.uml2.uml" version="5.3.0" match="compatible"/>
    </requires>
 
-
    <plugin
          id="org.eclipse.papyrus.ease"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.papyrus.aceeditor"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
 </feature>
diff --git a/features/org.eclipse.papyrus.ease.jupyter.feature/feature.properties b/features/org.eclipse.papyrus.ease.jupyter.feature/feature.properties
index 3a26561..b2ea14f 100644
--- a/features/org.eclipse.papyrus.ease.jupyter.feature/feature.properties
+++ b/features/org.eclipse.papyrus.ease.jupyter.feature/feature.properties
@@ -9,13 +9,13 @@
 ###############################################################################
 
 # "featureName" property - name of the feature
-featureName=EASE Jupyter Support (Incubation)
+featureName=Papyrus EASE Jupyter Support (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse Modeling Project 
 
 # description property - text of the "Feature Description"
-description=EASE Jupyter Support
+description=Papyrus EASE Jupyter Support
 ################ end of description property ##################################
 
 # "copyright" property - text of the "Feature Update Copyright"
diff --git a/releng/.project b/releng/.project
new file mode 100644
index 0000000..43a73bf
--- /dev/null
+++ b/releng/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>releng</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.papyrus.ease.configuration/pom.xml b/releng/org.eclipse.papyrus.ease.configuration/pom.xml
index 0b7f226..88fea55 100644
--- a/releng/org.eclipse.papyrus.ease.configuration/pom.xml
+++ b/releng/org.eclipse.papyrus.ease.configuration/pom.xml
@@ -115,10 +115,10 @@
 			</snapshots>
 		</repository>
 		<repository>
-            <id>license-feature</id>
-            <url>http://download.eclipse.org/cbi/updates/license/</url>
-            <layout>p2</layout>
-        </repository>
+			<id>license-feature</id>
+			<url>http://download.eclipse.org/cbi/updates/license/</url>
+			<layout>p2</layout>
+		</repository>
 	</repositories>
 
 	<pluginRepositories>
@@ -143,28 +143,46 @@
 			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
-	
+
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-compiler-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<encoding>UTF-8</encoding>
-						<extraClasspathElements>
-							<extraClasspathElement>
-								<groupId>com.oracle</groupId>
-								<artifactId>javafx</artifactId>
-								<version>8.0.0-SNAPSHOT</version>
-								<systemPath>${java.home}/lib/jfxswt.jar</systemPath>
-								<scope>system</scope>
-							</extraClasspathElement>
-						</extraClasspathElements>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<extraClasspathElements>
+						<extraClasspathElement>
+							<groupId>com.oracle</groupId>
+							<artifactId>javafx</artifactId>
+							<version>8.0.0-SNAPSHOT</version>
+							<systemPath>${java.home}/lib/jfxswt.jar</systemPath>
+							<scope>system</scope>
+						</extraClasspathElement>
+					</extraClasspathElements>
+				</configuration>
+			</plugin>
+			<plugin><!-- disable source bundle generation -->
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<phase />
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase />
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 	</build>
 </project>
diff --git a/releng/org.eclipse.papyrus.ease.p2/pom.xml b/releng/org.eclipse.papyrus.ease.p2/pom.xml
index b5e2491..7f93677 100644
--- a/releng/org.eclipse.papyrus.ease.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.ease.p2/pom.xml
@@ -35,7 +35,7 @@
 							<associateSites>
 								<!-- Py4j Update site -->
 								<site>http://eclipse.py4j.org/</site>
-								<site>http://download.eclipse.org/ease/update/nightly</site>
+								<!--site>http://download.eclipse.org/ease/update/nightly</site-->
 							</associateSites>
 						</configuration>
 					</execution>