diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 9b90061..5ddbbbd 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -41,11 +41,10 @@
    </license>
 
    <url>
-      <discovery label="Apache Commons from Orbit" url="http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/"/>
-      <discovery label="Xtext composite update site" url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
+      <discovery label="Eclipse Orbit" url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
    </url>
 
-   <requires>
+      <requires>
       <import plugin="org.eclipse.etrice.core.common" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.etrice.core.fsm" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime" version="3.0.0" match="greaterOrEqual"/>
diff --git a/releng/org.eclipse.etrice.releng/build.properties b/releng/org.eclipse.etrice.releng/build.properties
index 5802daf..c72ba7c 100644
--- a/releng/org.eclipse.etrice.releng/build.properties
+++ b/releng/org.eclipse.etrice.releng/build.properties
@@ -18,4 +18,8 @@
 eclipse.downloads=file:/home/data/httpd/download.eclipse.org
 
 etrice.download.area=/home/data/httpd/download.eclipse.org/etrice
-eclipse.staging.area=/shared/download-staging.priv/modeling/mdt/etrice
\ No newline at end of file
+eclipse.staging.area=/shared/download-staging.priv/modeling/mdt/etrice
+
+# define the range generation rules for required bundles
+pde.bundle.range.generation=false
+pde.feature.range.generation=false
\ No newline at end of file
diff --git a/team/ETrice.setup b/team/ETrice.setup
index 920f346..9527b37 100644
--- a/team/ETrice.setup
+++ b/team/ETrice.setup
@@ -37,37 +37,32 @@
   <setupTask
       xsi:type="setup.p2:P2Task">
     <requirement
-        name="org.eclipse.platform.feature.group"
-        versionRange="[4.6.0,5.0.0)"/>
+        name="org.eclipse.platform.feature.group"/>
     <requirement
-        name="org.eclipse.rcp.feature.group"
-        versionRange="[4.6.0,5.0.0)"/>
+        name="org.eclipse.rcp.feature.group"/>
     <requirement
-        name="org.eclipse.jdt.feature.group"
-        versionRange="[3.12.0,4.0.0)"/>
+        name="org.eclipse.jdt.feature.group"/>
     <requirement
-        name="org.eclipse.pde.feature.group"
-        versionRange="[3.12.0,4.0.0)"/>
+        name="org.eclipse.pde.feature.group"/>
     <requirement
         name="org.eclipse.emf.sdk.feature.group"/>
     <requirement
         name="org.eclipse.xtext.sdk.feature.group"/>
     <requirement
-        name="org.eclipse.emf.ecoretools.design.feature.group"/>
+        name="org.eclipse.emf.ecoretools.design.feature.group"
+        optional="true"/>
     <requirement
         name="org.eclipse.graphiti.sdk.feature.feature.group"/>
     <requirement
         name="org.eclipse.cdt.feature.group"/>
     <requirement
-        name="org.eclipse.tm.terminal.feature.feature.group"/>
+        name="org.eclipse.tm.terminal.feature.feature.group"
+        optional="true"/>
     <requirement
-        name="org.eclipse.egerrit.feature.feature.group"/>
+        name="org.eclipse.egerrit.feature.feature.group"
+        optional="true"/>
     <requirement
         name="org.eclipse.egit.feature.group"/>
-    <repository
-        url="http://download.eclipse.org/releases/neon"/>
-    <repository
-        url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
   </setupTask>
   <setupTask