diff --git a/bundles/org.eclipse.remote.console/pom.xml b/bundles/org.eclipse.remote.console/pom.xml
index 0251ef14836..1e677e41527 100644
--- a/bundles/org.eclipse.remote.console/pom.xml
+++ b/bundles/org.eclipse.remote.console/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.console</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>1.1.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.core/pom.xml b/bundles/org.eclipse.remote.core/pom.xml
index fd41dbbc047..c394f700afc 100644
--- a/bundles/org.eclipse.remote.core/pom.xml
+++ b/bundles/org.eclipse.remote.core/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.core</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>2.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.doc.isv/pom.xml b/bundles/org.eclipse.remote.doc.isv/pom.xml
index 38790c71dc3..ca7fddc972d 100644
--- a/bundles/org.eclipse.remote.doc.isv/pom.xml
+++ b/bundles/org.eclipse.remote.doc.isv/pom.xml
@@ -6,12 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.doc.isv</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
@@ -40,4 +39,5 @@
       </plugin>
     </plugins>
   </build>
+<version>1.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.jsch.core/pom.xml b/bundles/org.eclipse.remote.jsch.core/pom.xml
index 13dba0b313b..ee2758f7a03 100644
--- a/bundles/org.eclipse.remote.jsch.core/pom.xml
+++ b/bundles/org.eclipse.remote.jsch.core/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.jsch.core</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>1.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.jsch.ui/pom.xml b/bundles/org.eclipse.remote.jsch.ui/pom.xml
index ba869d051fd..8b53f595b37 100644
--- a/bundles/org.eclipse.remote.jsch.ui/pom.xml
+++ b/bundles/org.eclipse.remote.jsch.ui/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.jsch.ui</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>1.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.serial.core/pom.xml b/bundles/org.eclipse.remote.serial.core/pom.xml
index 0bd2d60d0f8..0c563f09c58 100644
--- a/bundles/org.eclipse.remote.serial.core/pom.xml
+++ b/bundles/org.eclipse.remote.serial.core/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.serial.core</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>1.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.serial.ui/pom.xml b/bundles/org.eclipse.remote.serial.ui/pom.xml
index 02a3c02ea56..cf98fab75fb 100644
--- a/bundles/org.eclipse.remote.serial.ui/pom.xml
+++ b/bundles/org.eclipse.remote.serial.ui/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.serial.ui</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>1.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.telnet.core/pom.xml b/bundles/org.eclipse.remote.telnet.core/pom.xml
index 05580f333ad..bc8b750510f 100644
--- a/bundles/org.eclipse.remote.telnet.core/pom.xml
+++ b/bundles/org.eclipse.remote.telnet.core/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.telnet.core</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>1.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.telnet.ui/pom.xml b/bundles/org.eclipse.remote.telnet.ui/pom.xml
index 12921538550..26c59f69e45 100644
--- a/bundles/org.eclipse.remote.telnet.ui/pom.xml
+++ b/bundles/org.eclipse.remote.telnet.ui/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.telnet.ui</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>1.0.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml
index e1b823928d3..42801b80250 100644
--- a/bundles/org.eclipse.remote.ui/pom.xml
+++ b/bundles/org.eclipse.remote.ui/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.remote.ui</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+<version>2.0.0-SNAPSHOT</version>
 </project>
diff --git a/features/org.eclipse.remote-feature/feature.xml b/features/org.eclipse.remote-feature/feature.xml
index 3dfe65909ec..ee2b54bebec 100644
--- a/features/org.eclipse.remote-feature/feature.xml
+++ b/features/org.eclipse.remote-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.remote"
       label="%featureName"
-      version="2.0.2.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml
index c9d50b98c91..73b067f5b18 100644
--- a/features/org.eclipse.remote-feature/pom.xml
+++ b/features/org.eclipse.remote-feature/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
@@ -48,6 +48,5 @@
   </build>
 
   <artifactId>org.eclipse.remote</artifactId>
-  <version>2.0.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.remote.console-feature/pom.xml b/features/org.eclipse.remote.console-feature/pom.xml
index b472f1db86a..2818106fb72 100644
--- a/features/org.eclipse.remote.console-feature/pom.xml
+++ b/features/org.eclipse.remote.console-feature/pom.xml
@@ -6,13 +6,12 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.remote.features</groupId>
   <artifactId>org.eclipse.remote.console</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.remote.serial-feature/feature.xml b/features/org.eclipse.remote.serial-feature/feature.xml
index d58a58197c0..db621cca4dc 100644
--- a/features/org.eclipse.remote.serial-feature/feature.xml
+++ b/features/org.eclipse.remote.serial-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.remote.serial"
       label="%featureName"
-      version="2.0.2.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.serial-feature/pom.xml b/features/org.eclipse.remote.serial-feature/pom.xml
index 024c56c96df..b931b8f0d6a 100644
--- a/features/org.eclipse.remote.serial-feature/pom.xml
+++ b/features/org.eclipse.remote.serial-feature/pom.xml
@@ -6,13 +6,12 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.remote.features</groupId>
   <artifactId>org.eclipse.remote.serial</artifactId>
-  <version>2.0.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.remote.telnet-feature/feature.xml b/features/org.eclipse.remote.telnet-feature/feature.xml
index 8aeb1850386..627f31cbe6a 100644
--- a/features/org.eclipse.remote.telnet-feature/feature.xml
+++ b/features/org.eclipse.remote.telnet-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.remote.telnet"
       label="%featureName"
-      version="2.0.2.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.remote.telnet-feature/pom.xml b/features/org.eclipse.remote.telnet-feature/pom.xml
index f6b7629b869..e746681187a 100644
--- a/features/org.eclipse.remote.telnet-feature/pom.xml
+++ b/features/org.eclipse.remote.telnet-feature/pom.xml
@@ -6,13 +6,12 @@
   <parent>
     <groupId>org.eclipse.remote</groupId>
     <artifactId>remote-parent</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.remote.features</groupId>
   <artifactId>org.eclipse.remote.telnet</artifactId>
-  <version>2.0.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index 32e8af4e6e3..ca8185e8176 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -10,13 +10,12 @@
 
 	<groupId>org.eclipse.remote</groupId>
 	<artifactId>remote-parent</artifactId>
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Remote Parent</name>
 
 	<properties>
 		<remote-release>nightly</remote-release>
-		<eclipse-release>luna</eclipse-release>
 		<tycho-version>0.24.0</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git</tycho.scmUrl>
@@ -144,8 +143,8 @@
 						<artifact>
 							<groupId>org.eclipse.remote</groupId>
 							<artifactId>org.eclipse.remote.target</artifactId>
-							<version>2.0.2-SNAPSHOT</version>
-							<classifier>mars</classifier>
+							<version>2.1.0-SNAPSHOT</version>
+							<classifier>neon</classifier>
 						</artifact>
 				  </target>
 				</configuration>
@@ -180,6 +179,20 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho-version}</version>
+		        <executions>
+		            <execution>
+		                <id>versions</id>
+		                <phase>validate</phase>
+		                <goals>
+		                    <goal>update-pom</goal>
+		                </goals>
+		            </execution>
+		        </executions>			
+        </plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/releng/org.eclipse.remote.repo/pom.xml b/releng/org.eclipse.remote.repo/pom.xml
index a26712c3ca5..fdfc50f9e13 100644
--- a/releng/org.eclipse.remote.repo/pom.xml
+++ b/releng/org.eclipse.remote.repo/pom.xml
@@ -7,11 +7,10 @@
 	<parent>
 		<groupId>org.eclipse.remote</groupId>
 		<artifactId>remote-parent</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
 	</parent>
 
-	<version>2.0.2-SNAPSHOT</version>
 	<artifactId>org.eclipse.remote.repo</artifactId>
 	<packaging>eclipse-repository</packaging>
 	
diff --git a/releng/org.eclipse.remote.target/neon.target b/releng/org.eclipse.remote.target/neon.target
new file mode 100644
index 00000000000..04844204ae4
--- /dev/null
+++ b/releng/org.eclipse.remote.target/neon.target
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="neon" sequenceNumber="0">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.mockito" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
+<unit id="org.eclipse.cdt.core" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
+</location>
+</locations>
+</target>
diff --git a/releng/org.eclipse.remote.target/pom.xml b/releng/org.eclipse.remote.target/pom.xml
index a2c6a72aa8c..a46e09c93ee 100644
--- a/releng/org.eclipse.remote.target/pom.xml
+++ b/releng/org.eclipse.remote.target/pom.xml
@@ -7,11 +7,10 @@
 	<parent>
 		<groupId>org.eclipse.remote</groupId>
 		<artifactId>remote-parent</artifactId>
-		<version>2.0.2-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
 	</parent>
 
-	<version>2.0.2-SNAPSHOT</version>
 	<artifactId>org.eclipse.remote.target</artifactId>
 	<packaging>pom</packaging>
 	
@@ -31,9 +30,9 @@
 						<configuration>
 							<artifacts>
 								<artifact>
-									<file>mars.target</file>
+									<file>neon.target</file>
 									<type>target</type>
-									<classifier>mars</classifier>
+									<classifier>neon</classifier>
 								</artifact>
 							</artifacts>
 						</configuration>