diff --git a/pom.xml b/pom.xml
index 109ed7c2d3f..5a624776270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,14 @@
     </license>
   </licenses>
   <properties>
-    <tycho-version>0.15.0</tycho-version>
-    <tycho-extras-version>0.15.0</tycho-extras-version>
+    <tycho-version>0.16.0</tycho-version>
+    <tycho-extras-version>0.16.0</tycho-extras-version>
+    <maven-resources-version>2.6</maven-resources-version>
+    <maven-antrun-version>1.7</maven-antrun-version>
+    <gmaven-version>1.4</gmaven-version>
+    <eclipse-jarsigner-version>1.0.2-SNAPSHOT</eclipse-jarsigner-version>
     <platform-version-name>juno</platform-version-name>
+    <tm-stream>juno</tm-stream>
     <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
     <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository</orbit-site>
     <rxtx-version>1.0.0.7837QcJa5vE7MnhE77YA7AU3SWUlbntVZAnlDoIGojcQd</rxtx-version>
@@ -50,7 +55,23 @@
   <pluginRepositories>
     <pluginRepository>
       <id>maven.eclipse.org</id>
-      <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
+      <url>http://maven.eclipse.org/nexus/content/repositories/public</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </pluginRepository>
+    <pluginRepository>
+      <id>sonatype</id>
+      <url>https://repository.sonatype.org/content/repositories/public</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
     </pluginRepository>
   </pluginRepositories>
   <repositories>
@@ -120,7 +141,7 @@
         <eclipse-site>http://download.eclipse.org/releases/staging</eclipse-site>
         <platform-version>[4.2,)</platform-version>
         <sdk-version>4.2</sdk-version>
-        <cdt-site>http://download.eclipse.org/tools/cdt/builds/juno/milestones/M7</cdt-site>
+        <cdt-site>http://download.eclipse.org/tools/cdt/releases/juno</cdt-site>
         <cdt-test-site>http://download.eclipse.org/tools/cdt/updates/indigo/</cdt-test-site>
       </properties>
       <repositories>
@@ -215,8 +236,6 @@
     <module>rse/plugins/org.eclipse.rse.ui.capabilities</module>
     <module>rse/plugins/org.eclipse.rse.useractions</module>
     <module>releng/org.eclipse.tm.repo</module>
-<!--    <module>releng/org.eclipse.tm.releng.test-feature</module>                                                                                                                     
--->
     <module>terminal/plugins/org.eclipse.tm.terminal</module>
     <module>terminal/plugins/org.eclipse.tm.terminal.serial</module>
     <module>terminal/plugins/org.eclipse.tm.terminal.ssh</module>
@@ -224,7 +243,6 @@
     <module>terminal/plugins/org.eclipse.tm.terminal.view</module>
     <module>terminal/plugins/org.eclipse.tm.terminal.local</module>
     <module>terminal/plugins/org.eclipse.tm.terminal.test</module>
-
     <module>terminal/features/org.eclipse.tm.terminal-feature</module>
     <module>terminal/features/org.eclipse.tm.terminal.serial-feature</module>
     <module>terminal/features/org.eclipse.tm.terminal.ssh-feature</module>
@@ -235,14 +253,13 @@
     <module>terminal/features/org.eclipse.tm.terminal.local-feature</module>
     <module>terminal/features/org.eclipse.tm.terminal.local.sdk-feature</module>
     <module>terminal/features/org.eclipse.tm.terminal.test-feature</module>
-	
     <module>rse/tests/org.eclipse.rse.tests</module>
     <module>rse/tests/org.eclipse.rse.tests-feature</module>
     <module>rse/tests/org.eclipse.rse.tests.framework</module>
     <module>rse/tests/org.eclipse.rse.tests.framework.examples</module>
-    <module>wince/org.eclipse.rse.wince-feature</module>                                                                                                       
-    <module>wince/org.eclipse.rse.subsystems.wince</module>                                                                                                    
-    <module>wince/org.eclipse.tm.rapi</module>    
+    <module>wince/org.eclipse.rse.wince-feature</module>
+    <module>wince/org.eclipse.rse.subsystems.wince</module>
+    <module>wince/org.eclipse.tm.rapi</module>
   </modules>
   <build>
     <plugins>
@@ -255,96 +272,72 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-          <pomDependencies>consider</pomDependencies>
-					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>ppc64</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>aix</os>
-							<ws>gtk</ws>
-							<arch>ppc</arch>
-						</environment>
-<!--						<environment>
-							<os>solaris</os>
-							<ws>gtk</ws>
-							<arch>sparc</arch>
-						</environment>
--->						
-					</environments>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src.xml</descriptor>
-          </descriptors>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-source-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-          <strictSrcIncludes>false</strictSrcIncludes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attach-source</id>
-            <goals>
-              <goal>plugin-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <configuration>
-          <strictBinIncludes>false</strictBinIncludes>
-          <archiveSite>true</archiveSite>
-        </configuration>
       </plugin>
     </plugins>
     <pluginManagement>
       <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>
+            <environments>
+              <environment>
+                <os>linux</os>
+                <ws>gtk</ws>
+                <arch>x86</arch>
+              </environment>
+              <environment>
+                <os>linux</os>
+                <ws>gtk</ws>
+                <arch>x86_64</arch>
+              </environment>
+              <environment>
+                <os>linux</os>
+                <ws>gtk</ws>
+                <arch>ppc64</arch>
+              </environment>
+              <environment>
+                <os>win32</os>
+                <ws>win32</ws>
+                <arch>x86</arch>
+              </environment>
+              <environment>
+                <os>win32</os>
+                <ws>win32</ws>
+                <arch>x86_64</arch>
+              </environment>
+              <environment>
+                <os>macosx</os>
+                <ws>cocoa</ws>
+                <arch>x86</arch>
+              </environment>
+              <environment>
+                <os>macosx</os>
+                <ws>cocoa</ws>
+                <arch>x86_64</arch>
+              </environment>
+              <environment>
+                <os>aix</os>
+                <ws>gtk</ws>
+                <arch>ppc</arch>
+              </environment>
+            </environments>
+            <resolver>p2</resolver>
+            <ignoreTychoRepositories>true</ignoreTychoRepositories>
+            <pomDependencies>consider</pomDependencies>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-compiler-plugin</artifactId>
@@ -355,11 +348,13 @@
             <target>1.5</target>
           </configuration>
         </plugin>
-        <!-- enable source bundle generation -->
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-source-plugin</artifactId>
           <version>${tycho-version}</version>
+          <configuration>
+            <encoding>UTF-8</encoding>
+          </configuration>
           <executions>
             <execution>
               <id>plugin-source</id>
@@ -369,6 +364,88 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-packaging-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.eclipse.tycho.extras</groupId>
+              <artifactId>tycho-buildtimestamp-jgit</artifactId>
+              <version>${tycho-version}</version>
+            </dependency>
+          </dependencies>
+          <configuration>
+            <strictBinIncludes>false</strictBinIncludes>
+            <timestampProvider>jgit</timestampProvider>
+            <jgit.ignore>pom.xml</jgit.ignore>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <baselineRepositories>
+              <repository>
+                <url>http://download.eclipse.org/tm/builds/${tm-stream}/nightly</url>
+              </repository>
+            </baselineRepositories>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-p2-repository-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <finalName>${project.artifactId}</finalName>
+          </configuration>
+        </plugin>
+        <!-- Pack200 and Signing -->
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-pack200a-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <executions>
+            <execution>
+              <id>pack200-normalize</id>
+              <goals>
+                <goal>normalize</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.cbi.maven.plugins</groupId>
+          <artifactId>eclipse-jarsigner-plugin</artifactId>
+          <version>${eclipse-jarsigner-version}</version>
+          <executions>
+            <execution>
+              <id>sign</id>
+              <phase>package</phase>
+              <goals>
+                <goal>sign</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.eclipse.tycho.extras</groupId>
+          <artifactId>tycho-pack200b-plugin</artifactId>
+          <version>${tycho-version}</version>
+          <executions>
+            <execution>
+              <id>pack200-pack</id>
+              <goals>
+                <goal>pack</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+	<!--    </plugins>
+    </pluginManagement>
+    <pluginManagement>
+	    <plugins>-->
         <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-surefire-plugin</artifactId>
@@ -396,7 +473,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.5</version>
+          <version>${maven-resources-version}</version>
           <configuration>
             <encoding>ISO-8859-1</encoding>
           </configuration>
@@ -404,7 +481,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.6</version>
+          <version>${maven-antrun-version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -419,14 +496,15 @@
           <artifactId>maven-site-plugin</artifactId>
           <version>3.0</version>
         </plugin>
-        <plugin>
+        <!--        <plugin>
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-packaging-plugin</artifactId>
           <version>${tycho-version}</version>
           <configuration>
             <format>'v'yyyyMMddHHmm</format>
           </configuration>
-        </plugin>
+  </plugin>
+  -->
       </plugins>
     </pluginManagement>
   </build>
diff --git a/releng/org.eclipse.tm.repo/pom.xml b/releng/org.eclipse.tm.repo/pom.xml
index 9b115fa0c2a..da4296559fa 100644
--- a/releng/org.eclipse.tm.repo/pom.xml
+++ b/releng/org.eclipse.tm.repo/pom.xml
@@ -28,6 +28,10 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.eclipse.cbi.maven.plugins</groupId>
+            <artifactId>eclipse-jarsigner-plugin</artifactId>
+          </plugin>
+          <!--<plugin>
             <groupId>org.eclipse.dash.maven</groupId>
             <artifactId>eclipse-signing-maven-plugin</artifactId>
             <version>1.0.5</version>
@@ -71,28 +75,27 @@
                 </goals>
               </execution>
             </executions>
-          </plugin>
+    </plugin> -->
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
-          <execution>
-            <id>prepare-serverruntime</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <property name="buildDirectory" value="${project.build.directory}/../../../"/>
-                <property name="builder" value="${project.build.directory}/../../../releng/org.eclipse.rse.build/"/>
-                <property name="buildId" value="3.4.2"/>
-                <ant antfile="${project.build.directory}/../../../dstoreTargets-git.xml">
-                  <target name="serverruntime"/>
-                </ant>
-              </target>
-            </configuration>
-          </execution>
-            
+              <execution>
+                <id>prepare-serverruntime</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <property name="buildDirectory" value="${project.build.directory}/../../../"/>
+                    <property name="builder" value="${project.build.directory}/../../../releng/org.eclipse.rse.build/"/>
+                    <property name="buildId" value="3.4.2"/>
+                    <ant antfile="${project.build.directory}/../../../dstoreTargets-git.xml">
+                      <target name="serverruntime"/>
+                    </ant>
+                  </target>
+                </configuration>
+              </execution>
               <execution>
                 <id>deploy</id>
                 <phase>install</phase>
@@ -106,7 +109,7 @@
                         <include name="**"/>
                       </fileset>
                     </delete>
-                    <zip destfile="${tm-install}/org.eclipse.tm.repo.zip">
+		    <!--<zip destfile="${tm-install}/org.eclipse.tm.repo.zip">
                       <fileset dir="target/checksumFix">
                         <include name="**"/>
                       </fileset>
@@ -115,7 +118,8 @@
                       <fileset dir="target/checksumFix">
                         <include name="**"/>
                       </fileset>
-                    </copy>
+	      </copy>
+	      -->
                     <chmod perm="g+w">
                       <fileset dir="${tm-install}">
                         <include name="**"/>
@@ -151,11 +155,6 @@
                 </goals>
                 <configuration>
                   <target>
-                    <!--   <delete includeemptydirs="false">
-                      <fileset dir="${tm-install}">
-                        <include name="**"/>
-                      </fileset>
-	      </delete> -->
                     <copy file="target/${tm-zipfile}" todir="${tm-install}">
                     </copy>
                     <chmod perm="g+w">