diff --git a/org.eclipse.epp.mpc-target/.project b/org.eclipse.epp.mpc-target/.project
new file mode 100644
index 0000000..2110662
--- /dev/null
+++ b/org.eclipse.epp.mpc-target/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epp.mpc-target</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.epp.mpc-target/kepler.target b/org.eclipse.epp.mpc-target/kepler.target
new file mode 100644
index 0000000..2a3e068
--- /dev/null
+++ b/org.eclipse.epp.mpc-target/kepler.target
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="Kepler" sequenceNumber="10">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/kepler"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.epp.mpc-target/luna.target b/org.eclipse.epp.mpc-target/luna.target
new file mode 100644
index 0000000..fed5b8b
--- /dev/null
+++ b/org.eclipse.epp.mpc-target/luna.target
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="luna" sequenceNumber="0">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/luna"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.epp.mpc-target/maintenance.target b/org.eclipse.epp.mpc-target/maintenance.target
new file mode 100644
index 0000000..79627bf
--- /dev/null
+++ b/org.eclipse.epp.mpc-target/maintenance.target
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="Maintenance" sequenceNumber="10">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/maintenance"/>
+</location>
+</locations>
+</target>
diff --git a/org.eclipse.epp.mpc-target/pom.xml b/org.eclipse.epp.mpc-target/pom.xml
new file mode 100644
index 0000000..f7fac59
--- /dev/null
+++ b/org.eclipse.epp.mpc-target/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+   xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.eclipse.epp.mpc</groupId>
+      <artifactId>org.eclipse.epp.mpc-parent</artifactId>
+      <version>1.3.0-SNAPSHOT</version>
+   </parent>
+   <artifactId>org.eclipse.epp.mpc-target</artifactId>
+   <packaging>pom</packaging>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>1.3</version>
+            <executions>
+               <execution>
+                  <id>attach-artifacts</id>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>attach-artifact</goal>
+                  </goals>
+                  <configuration>
+                     <artifacts>
+                        <artifact>
+                           <file>luna.target</file>
+                           <type>target</type>
+                           <classifier>luna</classifier>
+                        </artifact>
+                        <artifact>
+                           <file>kepler.target</file>
+                           <type>target</type>
+                           <classifier>kepler</classifier>
+                        </artifact>
+                        <artifact>
+                           <file>staging.target</file>
+                           <type>target</type>
+                           <classifier>staging</classifier>
+                        </artifact>
+                        <artifact>
+                           <file>maintenance.target</file>
+                           <type>target</type>
+                           <classifier>maintenance</classifier>
+                        </artifact>
+                     </artifacts>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+</project>
diff --git a/org.eclipse.epp.mpc-target/staging.target b/org.eclipse.epp.mpc-target/staging.target
new file mode 100644
index 0000000..b8433e8
--- /dev/null
+++ b/org.eclipse.epp.mpc-target/staging.target
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="Staging" sequenceNumber="0">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/staging"/>
+</location>
+</locations>
+</target>
diff --git a/pom.xml b/pom.xml
index 7eb887b..f200fbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,9 @@
   <packaging>pom</packaging>
 
   <properties>
+   <mpc-version>1.3.0-SNAPSHOT</mpc-version>
+
+   <target-platform>luna</target-platform>
    <java-version>1.5</java-version>
 
    <tycho-version>0.20.0</tycho-version>
@@ -83,6 +86,7 @@
   </licenses>
 
   <modules>
+    <module>org.eclipse.epp.mpc-target</module>
     <module>org.eclipse.epp.mpc.core</module>
     <module>org.eclipse.epp.mpc.feature</module>
     <module>org.eclipse.epp.mpc.help.ui</module>
@@ -91,69 +95,30 @@
     <module>org.eclipse.epp.mpc.ui</module>
   </modules>
 
-  <repositories>
-	<repository>
-	  <id>eclipse-orbit</id>
-	  <layout>p2</layout>
-	  <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/</url>
-	</repository>
-  </repositories>
-
   <profiles>
     <profile>
       <id>kepler</id>
       <properties>
-        <platform-version>[4.3.0,4.4.0)</platform-version>
+        <target-platform>kepler</target-platform>
       </properties>
-	  <repositories>
-		<repository>
-		  <id>kepler</id>
-		  <layout>p2</layout>
-		  <url>http://download.eclipse.org/releases/kepler/</url>
-		</repository>
-	  </repositories>
     </profile>
     <profile>
       <id>maintenance</id>
       <properties>
-        <platform-version>[4.3.0,4.4.0)</platform-version>
+        <target-platform>maintenance</target-platform>
       </properties>
-	  <repositories>
-		<repository>
-		  <id>maintenance</id>
-		  <layout>p2</layout>
-		  <url>http://download.eclipse.org/releases/maintenance/</url>
-		</repository>
-	  </repositories>
     </profile>
     <profile>
       <id>luna</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
-      <properties>
-        <platform-version>[4.4.0,4.5.0)</platform-version>
-      </properties>
-	  <repositories>
-		<repository>
-		  <id>luna</id>
-		  <layout>p2</layout>
-		  <url>http://download.eclipse.org/releases/luna/</url>
-		</repository>
-	  </repositories>
     </profile>
     <profile>
       <id>staging</id>
       <properties>
-        <platform-version>[4.4.0,4.5.0)</platform-version>
+        <target-platform>staging</target-platform>
       </properties>
-	  <repositories>
-		<repository>
-		  <id>staging</id>
-		  <layout>p2</layout>
-		  <url>http://download.eclipse.org/releases/staging/</url>
-		</repository>
-	  </repositories>
     </profile>
     <profile>
       <id>dist</id>
@@ -230,6 +195,17 @@
         <version>${tycho-version}</version>
         <configuration>
           <resolver>p2</resolver>
+          <executionEnvironmentDefault>J2SE-${java-version}</executionEnvironmentDefault>
+          <includePackedArtifacts>true</includePackedArtifacts>
+          <ignoreTychoRepositories>true</ignoreTychoRepositories>
+          <target>
+            <artifact>
+              <groupId>org.eclipse.epp.mpc</groupId>
+              <artifactId>org.eclipse.epp.mpc-target</artifactId>
+              <version>${mpc-version}</version>
+              <classifier>${target-platform}</classifier>
+            </artifact>
+          </target>
           <environments>
             <environment>
               <os>win32</os>