diff --git a/.gitignore b/.gitignore
index 74484d40d3..4fdf5c5632 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ bin/
 .META-INF_*
 pom.tycho
 .tycho-consumer-pom.xml
+.flattened-pom.xml
 apiAnalyzer-workspace/
\ No newline at end of file
diff --git a/.mvn/maven.config b/.mvn/maven.config
index 8b6bb37cc3..55539b0bd9 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,2 +1,3 @@
 -Pbuild-individual-bundles
 -Dtycho.surefire.deleteWorkDir=true
+-Dtycho.localArtifacts=ignore
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index 41df5dfeac..c9b3ebafe2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -8,7 +8,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.eclipse.equinox.p2</groupId>
+		<groupId>org.eclipse.platform</groupId>
 		<artifactId>rt.equinox.p2</artifactId>
 		<version>${releaseVersion}${qualifier}</version>
 		<relativePath>../../</relativePath>
@@ -39,7 +39,7 @@
 	<dependencies>
 		<!-- The tests require the reconciler product -->
 		<dependency>
-			<groupId>org.eclipse.equinox.p2</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>org.eclipse.equinox.p2.reconciler</artifactId>
 			<version>1.1.0-SNAPSHOT</version>
 			<type>pom</type>
diff --git a/examples/pom.xml b/examples/pom.xml
index 5cdc27872f..e5110a62c8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.eclipse.equinox.p2</groupId>
+    <groupId>org.eclipse.platform</groupId>
     <artifactId>rt.equinox.p2</artifactId>
     <version>${releaseVersion}${qualifier}</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/pom.xml b/pom.xml
index 030bb67d15..7cbc22851f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
-  <groupId>org.eclipse.equinox.p2</groupId>
+  <groupId>org.eclipse.platform</groupId>
   <artifactId>rt.equinox.p2</artifactId>
   <packaging>pom</packaging>
   <version>${releaseVersion}${qualifier}</version>
@@ -128,6 +128,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-update-consumer-pom</id>
+            <configuration>
+				<skipPomGeneration>false</skipPomGeneration>
+			</configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>