diff --git a/org.eclipse.mylyn.emf.tests/pom.xml b/org.eclipse.mylyn.emf.tests/pom.xml
index 3cc35e0..5a9ae79 100644
--- a/org.eclipse.mylyn.emf.tests/pom.xml
+++ b/org.eclipse.mylyn.emf.tests/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/org.eclipse.mylyn.emf.ui/pom.xml b/org.eclipse.mylyn.emf.ui/pom.xml
index e0e7303..d74664d 100644
--- a/org.eclipse.mylyn.emf.ui/pom.xml
+++ b/org.eclipse.mylyn.emf.ui/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.examples.monitor.study/pom.xml b/org.eclipse.mylyn.examples.monitor.study/pom.xml
index f6d8f02..e619553 100644
--- a/org.eclipse.mylyn.examples.monitor.study/pom.xml
+++ b/org.eclipse.mylyn.examples.monitor.study/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.experimental-sdk-feature/pom.xml b/org.eclipse.mylyn.experimental-sdk-feature/pom.xml
index 5035e3d..6731e20 100644
--- a/org.eclipse.mylyn.experimental-sdk-feature/pom.xml
+++ b/org.eclipse.mylyn.experimental-sdk-feature/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.ide.capabilities/pom.xml b/org.eclipse.mylyn.ide.capabilities/pom.xml
index 2794a3c..61a861e 100644
--- a/org.eclipse.mylyn.ide.capabilities/pom.xml
+++ b/org.eclipse.mylyn.ide.capabilities/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.incubator-site/pom.xml b/org.eclipse.mylyn.incubator-site/pom.xml
index 1819cfa..3db4540 100644
--- a/org.eclipse.mylyn.incubator-site/pom.xml
+++ b/org.eclipse.mylyn.incubator-site/pom.xml
@@ -27,6 +27,20 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <resolver>p2</resolver>
+          <environments>
+            <environment>
+              <os>win32</os>
+              <arch>x86</arch>
+            </environment>
+          </environments>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-4</version>
diff --git a/org.eclipse.mylyn.monitor.reports/pom.xml b/org.eclipse.mylyn.monitor.reports/pom.xml
index b2a22ac..90c6d22 100644
--- a/org.eclipse.mylyn.monitor.reports/pom.xml
+++ b/org.eclipse.mylyn.monitor.reports/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.monitor.usage/pom.xml b/org.eclipse.mylyn.monitor.usage/pom.xml
index 72c31ac..56a37d8 100644
--- a/org.eclipse.mylyn.monitor.usage/pom.xml
+++ b/org.eclipse.mylyn.monitor.usage/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.sandbox.dev/pom.xml b/org.eclipse.mylyn.sandbox.dev/pom.xml
index 3fb84f3..854b268 100644
--- a/org.eclipse.mylyn.sandbox.dev/pom.xml
+++ b/org.eclipse.mylyn.sandbox.dev/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.sandbox.search-feature/pom.xml b/org.eclipse.mylyn.sandbox.search-feature/pom.xml
index 521b032..1d9d2ee 100644
--- a/org.eclipse.mylyn.sandbox.search-feature/pom.xml
+++ b/org.eclipse.mylyn.sandbox.search-feature/pom.xml
@@ -16,7 +16,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
         <configuration>
diff --git a/org.eclipse.mylyn.sandbox.search.ui/pom.xml b/org.eclipse.mylyn.sandbox.search.ui/pom.xml
index 4a7ea2e..413b04f 100644
--- a/org.eclipse.mylyn.sandbox.search.ui/pom.xml
+++ b/org.eclipse.mylyn.sandbox.search.ui/pom.xml
@@ -16,7 +16,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
         <configuration>
@@ -30,8 +30,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.sandbox.tests/pom.xml b/org.eclipse.mylyn.sandbox.tests/pom.xml
index f9ce8c6..87e7fa2 100644
--- a/org.eclipse.mylyn.sandbox.tests/pom.xml
+++ b/org.eclipse.mylyn.sandbox.tests/pom.xml
@@ -17,8 +17,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-test-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
         <version>${tycho-version}</version>
         <configuration>
           <useUIHarness>true</useUIHarness>
@@ -44,8 +44,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
diff --git a/org.eclipse.mylyn.sandbox.ui/pom.xml b/org.eclipse.mylyn.sandbox.ui/pom.xml
index 3a72a47..c319943 100644
--- a/org.eclipse.mylyn.sandbox.ui/pom.xml
+++ b/org.eclipse.mylyn.sandbox.ui/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.trac.wiki/pom.xml b/org.eclipse.mylyn.trac.wiki/pom.xml
index 8317f7b..2928707 100644
--- a/org.eclipse.mylyn.trac.wiki/pom.xml
+++ b/org.eclipse.mylyn.trac.wiki/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.web.tasks/pom.xml b/org.eclipse.mylyn.web.tasks/pom.xml
index c9e398c..f224a3b 100644
--- a/org.eclipse.mylyn.web.tasks/pom.xml
+++ b/org.eclipse.mylyn.web.tasks/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.mylyn.wikitext.sandbox.ui/pom.xml b/org.eclipse.mylyn.wikitext.sandbox.ui/pom.xml
index a6f321c..55a9470 100644
--- a/org.eclipse.mylyn.wikitext.sandbox.ui/pom.xml
+++ b/org.eclipse.mylyn.wikitext.sandbox.ui/pom.xml
@@ -14,8 +14,8 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>maven-osgi-source-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/pom.xml b/pom.xml
index 03a63fa..1f91dc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,13 +180,13 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-maven-plugin</artifactId>
         <version>${tycho-version}</version>
         <extensions>true</extensions>
       </plugin>
       <plugin>
-        <groupId>org.sonatype.tycho</groupId>
+        <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
         <configuration>
@@ -224,8 +224,8 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.sonatype.tycho</groupId>
-          <artifactId>maven-osgi-compiler-plugin</artifactId>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-compiler-plugin</artifactId>
           <version>${tycho-version}</version>
           <configuration>
             <encoding>UTF-8</encoding>
@@ -235,8 +235,8 @@
           <!-- TODO remove workaround when
              https://issues.sonatype.org/browse/TYCHO-473
              is fixed -->
-          <groupId>org.sonatype.tycho</groupId>
-          <artifactId>maven-osgi-source-plugin</artifactId>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-source-plugin</artifactId>
           <version>${tycho-version}</version>
           <executions>
             <execution>
@@ -249,8 +249,8 @@
           </executions>
         </plugin>
         <plugin>
-          <groupId>org.sonatype.tycho</groupId>
-          <artifactId>maven-osgi-packaging-plugin</artifactId>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-packaging-plugin</artifactId>
           <version>${tycho-version}</version>
           <configuration>
             <format>'I'yyyyMMdd-HHmm</format>