diff --git a/common/branding/META-INF/MANIFEST.MF b/common/branding/META-INF/MANIFEST.MF
@@ -1,15 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
-Built-By: Code-House
-Tool: Bnd-0.0.357
-Bundle-Name: org.smxide.common.branding
-Created-By: Apache Maven Bundle Plugin
-Build-Jdk: 1.6.0_21
-Bundle-Version: 0.2.0.SNAPSHOT
-Bnd-LastModified: 1287591353572
+Bundle-Name: %Bundle-Name
+Bundle-Version: 0.2.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: %Bundle-Description
 Bundle-SymbolicName: org.smxide.common.branding;singleton:=true
-Bundle-Vendor: Code-House
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/common/branding/plugin.properties → .../branding/OSGI-INF/l10n/bundle.properties b/common/branding/plugin.properties → .../branding/OSGI-INF/l10n/bundle.properties
diff --git a/common/branding/build.properties b/common/branding/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                smx.gif,\
                about.ini,\
                about.properties,\
-               plugin.properties,\
-               plugin.xml,\
-               plugin.properties
+               OSGI-INF/,\
+               plugin.xml
diff --git a/common/branding/pom.xml b/common/branding/pom.xml
@@ -15,4 +15,9 @@
 
     <packaging>eclipse-plugin</packaging>
 
+    <properties>
+        <repository-prefix>${project.parent.basedir}</repository-prefix>
+    </properties>
+
+
 </project>
diff --git a/common/catalog/META-INF/MANIFEST.MF b/common/catalog/META-INF/MANIFEST.MF
@@ -1,16 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
-Built-By: Code-House
-Tool: Bnd-0.0.357
-Bundle-Name: org.smxide.common.catalog
-Created-By: Apache Maven Bundle Plugin
+Bundle-Name: %Bundle-Name
 Require-Bundle: org.eclipse.wst.xml.core
-Build-Jdk: 1.6.0_21
-Bundle-Version: 0.2.0.SNAPSHOT
-Bnd-LastModified: 1287591353572
+Bundle-Version: 0.2.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: %Bundle-Description
 Bundle-SymbolicName: org.smxide.common.catalog;singleton:=true
-Bundle-Vendor: Code-House
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/common/catalog/plugin.properties → ...n/catalog/OSGI-INF/l10n/bundle.properties b/common/catalog/plugin.properties → ...n/catalog/OSGI-INF/l10n/bundle.properties
diff --git a/common/catalog/build.properties b/common/catalog/build.properties
@@ -3,4 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties
+               OSGI-INF/
diff --git a/common/catalog/pom.xml b/common/catalog/pom.xml
@@ -15,4 +15,4 @@
 
     <packaging>eclipse-plugin</packaging>
 
-</project>
+</project>
diff --git a/common/editor/META-INF/MANIFEST.MF b/common/editor/META-INF/MANIFEST.MF
@@ -1,15 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
-Built-By: Code-House
-Tool: Bnd-0.0.357
-Bundle-Name: org.smxide.common.editor
-Created-By: Apache Maven Bundle Plugin
-Build-Jdk: 1.6.0_21
-Bundle-Version: 0.2.0.SNAPSHOT
-Bnd-LastModified: 1287591353572
+Bundle-Name: %Bundle-Name
+Bundle-Version: 0.2.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: %Bundle-Description
 Bundle-SymbolicName: org.smxide.common.editor;singleton:=true
-Bundle-Vendor: Code-House
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/common/editor/plugin.properties → ...on/editor/OSGI-INF/l10n/bundle.properties b/common/editor/plugin.properties → ...on/editor/OSGI-INF/l10n/bundle.properties
diff --git a/common/editor/build.properties b/common/editor/build.properties
@@ -3,4 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties
+               OSGI-INF/
diff --git a/common/editor/pom.xml b/common/editor/pom.xml
@@ -15,4 +15,8 @@
 
     <packaging>eclipse-plugin</packaging>
 
+    <properties>
+        <repository-prefix>${project.parent.basedir}</repository-prefix>
+    </properties>
+
 </project>
diff --git a/common/feature/pom.xml b/common/feature/pom.xml
@@ -15,21 +15,8 @@
 
     <packaging>eclipse-feature</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <projectnatures>
-                        <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-                    </projectnatures>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-                    </buildcommands>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <properties>
+        <repository-prefix>${project.parent.basedir}</repository-prefix>
+    </properties>
 
 </project>
diff --git a/cxf/catalog/META-INF/MANIFEST.MF b/cxf/catalog/META-INF/MANIFEST.MF
@@ -1,16 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
-Built-By: Code-House
-Tool: Bnd-0.0.357
-Bundle-Name: org.smxide.cxf.catalog
-Created-By: Apache Maven Bundle Plugin
+Bundle-Name: %Bundle-Name
 Require-Bundle: org.eclipse.wst.xml.core
-Build-Jdk: 1.6.0_21
-Bundle-Version: 0.2.0.SNAPSHOT
-Bnd-LastModified: 1287591353572
+Bundle-Version: 0.2.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: %Bundle-Description
 Bundle-SymbolicName: org.smxide.cxf.catalog;singleton:=true
-Bundle-Vendor: Code-House
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/cxf/catalog/plugin.properties → cxf/catalog/OSGI-INF/l10n/bundle.properties b/cxf/catalog/plugin.properties → cxf/catalog/OSGI-INF/l10n/bundle.properties
diff --git a/cxf/catalog/build.properties b/cxf/catalog/build.properties
@@ -3,6 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties,\
+               OSGI-INF/,\
                xsd/,\
                fuse/
diff --git a/cxf/catalog/pom.xml b/cxf/catalog/pom.xml
@@ -15,4 +15,4 @@
 
     <packaging>eclipse-plugin</packaging>
 
-</project>
+</project>
diff --git a/cxf/feature/pom.xml b/cxf/feature/pom.xml
@@ -15,21 +15,4 @@
 
     <packaging>eclipse-feature</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <projectnatures>
-                        <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-                    </projectnatures>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-                    </buildcommands>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+</project>
diff --git a/dependencies/README.textile b/dependencies/README.textile
diff --git a/dependencies/bundles/camel-spring/pom.xml b/dependencies/bundles/camel-spring/pom.xml
diff --git a/dependencies/bundles/pom.xml b/dependencies/bundles/pom.xml
diff --git a/dependencies/feature/feature.xml b/dependencies/feature/feature.xml
diff --git a/dependencies/feature/pom.xml b/dependencies/feature/pom.xml
diff --git a/dependencies/log.txt b/dependencies/log.txt
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
diff --git a/dependencies/update-site/pom.xml b/dependencies/update-site/pom.xml
diff --git a/dependencies/update-site/site.xml b/dependencies/update-site/site.xml
diff --git a/dependencies/update-site/src/main/assembly/updatesite.xml b/dependencies/update-site/src/main/assembly/updatesite.xml
diff --git a/karaf/catalog/META-INF/MANIFEST.MF b/karaf/catalog/META-INF/MANIFEST.MF
@@ -1,16 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
-Built-By: Code-House
-Tool: Bnd-0.0.357
-Bundle-Name: org.smxide.karaf.catalog
-Created-By: Apache Maven Bundle Plugin
+Bundle-Name: %Bundle-Name
 Require-Bundle: org.eclipse.wst.xml.core
-Build-Jdk: 1.6.0_21
-Bundle-Version: 0.2.0.SNAPSHOT
-Bnd-LastModified: 1287591353572
+Bundle-Version: 0.2.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: %Bundle-Description
 Bundle-SymbolicName: org.smxide.karaf.catalog;singleton:=true
-Bundle-Vendor: Code-House
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/karaf/catalog/plugin.properties → ...f/catalog/OSGI-INF/l10n/bundle.properties b/karaf/catalog/plugin.properties → ...f/catalog/OSGI-INF/l10n/bundle.properties
diff --git a/karaf/catalog/build.properties b/karaf/catalog/build.properties
@@ -3,6 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties,\
+               OSGI-INF/,\
                xsd/,\
                fuse/
diff --git a/karaf/catalog/pom.xml b/karaf/catalog/pom.xml
@@ -15,4 +15,4 @@
 
     <packaging>eclipse-plugin</packaging>
 
-</project>
+</project>
diff --git a/karaf/feature/pom.xml b/karaf/feature/pom.xml
@@ -15,21 +15,4 @@
 
     <packaging>eclipse-feature</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <projectnatures>
-                        <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-                    </projectnatures>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-                    </buildcommands>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -38,6 +38,8 @@
         <!-- General upload properties -->
         <uploadUrl>ftp://servicemix.pl</uploadUrl>
         <uploadServerId>smxide</uploadServerId>
+
+        <repository-location>/Users/lukasz/projects/servicemix-ide/repository/bundles/target/repository</repository-location>
     </properties>
 
     <scm>
@@ -99,18 +101,21 @@
         <!-- Most important comes to end -->
         <module>target-platform</module>
 
-        <!--
-        Dependencies are built separatelly, without Tycho and p2 resolver
-        <module>dependencies/feature</module>
-        <module>dependencies/update-site</module>
-        -->
     </modules>
 
     <organization>
         <name>Code-House</name>
         <url>http://code-house.org</url>
     </organization>
 
+    <repositories>
+        <repository>
+            <id>system-bundles</id>
+            <url>file:${repository-location}</url>
+            <layout>p2</layout>
+        </repository>
+    </repositories>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -150,38 +155,41 @@
                         <ignoreTychoRepositories>true</ignoreTychoRepositories>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.1.0</version>
-                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.7</version>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>1.0.1</version>
+                    <executions>
+                        <execution>
+                            <id>enforce-files-exist</id>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
+                            <configuration>
+                                <rules>
+                                    <requireFilesExist>
+                                        <message>P2 repository with dependencies do not exist. Please run mvn clean install inside repository/bundles directory.</message>
+                                        <files>
+                                            <file>${repository-location}/artifacts.xml</file>
+                                            <file>${repository-location}/content.xml</file>
+                                        </files>
+                                        <allowNulls>false</allowNulls>
+                                    </requireFilesExist>
+                                </rules>
+                                <fail>true</fail>
+                            </configuration>
+                        </execution>
+                    </executions>
                 </plugin>
             </plugins>
         </pluginManagement>
 
         <plugins>
-            <!-- Maven to eclipse -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <buildOutputDirectory>bin</buildOutputDirectory>
-                    <projectNameTemplate>[artifactId]</projectNameTemplate>
-                    <pde>false</pde>
-
-                    <!-- Make all Maven modules PDE plugins by default -->
-                    <additionalProjectnatures>
-                        <projectnature>org.eclipse.pde.PluginNature</projectnature>
-                    </additionalProjectnatures>
-                    <additionalBuildcommands>
-                        <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
-                        <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
-                    </additionalBuildcommands>
-                </configuration>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.0.1</version>
             </plugin>
 
             <plugin>
@@ -196,14 +204,13 @@
                 <artifactId>target-platform-configuration</artifactId>
                 <version>${tycho.version}</version>
                 <configuration>
-                    <resolver>p2</resolver>
                     <target>
                         <artifact>
                             <groupId>org.smxide</groupId>
                             <artifactId>target-platform</artifactId>
                             <version>${project.version}</version>
                             <type>target</type>
-                            <classifier>smxide</classifier>
+                            <classifier>e3.6</classifier>
                         </artifact>
                     </target>
                 </configuration>
@@ -214,27 +221,11 @@
                 <artifactId>maven-osgi-packaging-plugin</artifactId>
                 <version>${tycho.version}</version>
                 <configuration>
-                    <!-- This parameter turns off .qualifier verification -->
                     <strictVersions>false</strictVersions>
                 </configuration>
             </plugin>
 
         </plugins>
     </build>
 
-    <repositories>
-        <!-- Eclipse 3.6 -->
-        <repository>
-            <id>helios</id>
-            <layout>p2</layout>
-            <url>http://download.eclipse.org/releases/indigo</url>
-        </repository>
-        <!-- Spring IDE 2.x for e3.6 -->
-        <repository>
-            <id>springide</id>
-            <layout>p2</layout>
-            <url>http://dist.springsource.com/milestone/TOOLS/update/e3.7</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/repository/bundles/pom.xml b/repository/bundles/pom.xml
@@ -0,0 +1,92 @@
+<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.code-house.p2.obr</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+<!--         <relativePath>../parent</relativePath> -->
+    </parent>
+
+    <groupId>org.code-house.p2.obr</groupId>
+    <artifactId>org.code-house.p2.obr.dependencies</artifactId>
+
+    <packaging>pom</packaging>
+
+    <properties>
+        <repository-directory></repository-directory>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-spring</artifactId>
+            <version>5.4.0</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- Configuration for the PublishFeaturesAndBundlesMojoTest -->
+            <plugin>
+                <groupId>org.eclipse.tycho.extras</groupId>
+                <artifactId>tycho-p2-extras-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>publish-features-and-bundles</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <compress>false</compress>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-bundles-for-publishing</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <prependGroupId>true</prependGroupId>
+                    <outputDirectory>${project.basedir}/target/source/plugins</outputDirectory>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-repository-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>archive-repository</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/servicemix/archetype/META-INF/MANIFEST.MF b/servicemix/archetype/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Name: org.smxide.servicemix.archetype
 Created-By: Apache Maven Bundle Plugin
 Require-Bundle: org.eclipse.wst.xml.core
 Build-Jdk: 1.6.0_21
-Bundle-Version: 0.2.0.SNAPSHOT
+Bundle-Version: 0.2.0.qualifier
 Bnd-LastModified: 1287591353572
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html

diff --git a/servicemix/archetype/pom.xml b/servicemix/archetype/pom.xml
@@ -16,6 +16,8 @@
     <packaging>eclipse-plugin</packaging>
 
     <properties>
+        <repository-prefix>${project.parent.basedir}</repository-prefix>
+
         <!-- Skip wagon operations -->
         <wagonSkip>false</wagonSkip>
 

diff --git a/servicemix/catalog/META-INF/MANIFEST.MF b/servicemix/catalog/META-INF/MANIFEST.MF
@@ -1,16 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ActivationPolicy: lazy
-Built-By: Code-House
-Tool: Bnd-0.0.357
-Bundle-Name: org.smxide.servicemix.catalog
-Created-By: Apache Maven Bundle Plugin
+Bundle-Name: %Bundle-Name
 Require-Bundle: org.eclipse.wst.xml.core
-Build-Jdk: 1.6.0_21
-Bundle-Version: 0.2.0.SNAPSHOT
-Bnd-LastModified: 1287591353572
+Bundle-Version: 0.2.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Bundle-Description: %Bundle-Description
 Bundle-SymbolicName: org.smxide.servicemix.catalog;singleton:=true
-Bundle-Vendor: Code-House
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/servicemix/catalog/plugin.properties → ...x/catalog/OSGI-INF/l10n/bundle.properties b/servicemix/catalog/plugin.properties → ...x/catalog/OSGI-INF/l10n/bundle.properties
diff --git a/servicemix/catalog/build.properties b/servicemix/catalog/build.properties
@@ -2,6 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties,\
+               OSGI-INF/,\
                fuse/,\
                xsd/
diff --git a/servicemix/catalog/pom.xml b/servicemix/catalog/pom.xml
@@ -15,4 +15,4 @@
 
     <packaging>eclipse-plugin</packaging>
 
-</project>
+</project>
diff --git a/servicemix/feature/pom.xml b/servicemix/feature/pom.xml
@@ -15,21 +15,4 @@
 
     <packaging>eclipse-feature</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <projectnatures>
-                        <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-                    </projectnatures>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-                    </buildcommands>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+</project>
diff --git a/target-platform/p2metadata.textile b/target-platform/p2metadata.textile
diff --git a/target-platform/pom.xml b/target-platform/pom.xml
@@ -13,6 +13,10 @@
     <artifactId>target-platform</artifactId>
     <packaging>pom</packaging>
 
+    <properties>
+        <repository-prefix>${project.parent.basedir}</repository-prefix>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -31,12 +35,59 @@
                 <configuration>
                     <artifacts>
                          <artifact>
-                            <file>smxide.target</file>
+                            <file>smxide-e3.6.target</file>
+                            <type>target</type>
+                            <classifier>e3.6</classifier>
+                        </artifact>
+                         <artifact>
+                            <file>smxide-e3.7.target</file>
+                            <type>target</type>
+                            <classifier>e3.7</classifier>
+                        </artifact>
+                         <artifact>
+                            <file>smxide-e3.8.target</file>
                             <type>target</type>
+                            <classifier>e3.8</classifier>
                         </artifact>
                     </artifacts>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xml-maven-plugin</artifactId>
+                <version>1.0-beta-3</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>transform</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <transformationSets>
+                        <transformationSet>
+                            <stylesheet>target-eclipse.xsl</stylesheet>
+                            <dir>${project.basedir}</dir>
+                            <includes>
+                                <include>*.target</include>
+                            </includes>
+                            <outputDir>${project.build.directory}</outputDir>
+                            <parameters>
+                                <parameter>
+                                    <name>location</name><value>${repository-location}</value>
+                                </parameter>
+                            </parameters>
+                            <fileMappers>
+                                <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+                                    <targetExtension>standalone.target</targetExtension>
+                                </fileMapper>
+                            </fileMappers>
+                        </transformationSet>
+                    </transformationSets>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/target-platform/smxide-e3.6.target b/target-platform/smxide-e3.6.target
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="smxide-e3.6">
+    <locations>
+        <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+            <unit id="org.maven.ide.eclipse.feature.feature.group" version="0.12.1.20110112-1712"/>
+            <repository location="http://m2eclipse.sonatype.org/sites/m2e"/>
+        </location>
+        <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+            <unit id="org.springframework.ide.eclipse.feature.feature.group" version="2.8.1.201111220115-RELEASE"/>
+            <repository location="http://dist.springsource.com/release/TOOLS/update/e3.6"/>
+        </location>
+        <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+            <unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFW6FLFlmjJcvz03jyeFBLS_F"/>
+            <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.3.v201102160550-7H7AFUWDxumQJOi9ghcTb5YgkwEZ"/>
+            <unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/>
+            <repository location="http://download.eclipse.org/releases/helios"/>
+        </location>
+    </locations>
+</target>
diff --git a/target-platform/smxide-e3.7.target b/target-platform/smxide-e3.7.target
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="smxide-e3.7">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.m2e.feature.feature.group" version="1.0.100.20110804-1717"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcoFMLfTabvKsR5Qm9rBGEBK"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.3.1.v201108102009-7H7EFZ3DxumTlaI6nheRdHo2p1KaDIL1Uz-S3PL"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
+</location>
+</locations>
+</target>
diff --git a/target-platform/smxide-e3.8.target b/target-platform/smxide-e3.8.target
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="smxide-e3.8">
+<locations>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.m2e.feature.feature.group" version="1.1.0.20111108-0328"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.8.0.v20111011-0800-7z8lFm4FMTfGOa5x46SENNY9B15B"/>
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.4.0.v201111021744-7H7GFb7DxumUllJ4dhgXiL0ahrFpWOMqRwSz00PL"/>
+<repository location="http://download.eclipse.org/releases/staging"/>
+</location>
+</locations>
+</target>
diff --git a/target-platform/smxide.target b/target-platform/smxide.target
diff --git a/target-platform/target-eclipse.xsl b/target-platform/target-eclipse.xsl
@@ -0,0 +1,30 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <xsl:output method="xml" encoding="UTF-8" indent="yes" />
+
+    <xsl:param name="location" />
+
+    <xsl:template match="*|@*">
+        <xsl:call-template name="copy" />
+    </xsl:template>
+
+    <xsl:template match="//*[local-name(.) = 'locations']">
+        <locations>
+            <xsl:apply-templates />
+
+            <!-- Append directory with generated p2 metadata to locations -->
+            <location type="Directory">
+                <xsl:attribute name="path">
+                    <xsl:value-of select="$location" />
+                </xsl:attribute>
+            </location>
+        </locations>
+    </xsl:template>
+
+    <xsl:template name="copy">
+        <xsl:copy>
+            <xsl:apply-templates select="node()|@*"/>
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/update-site/bookmarks.xml b/update-site/bookmarks.xml
@@ -6,9 +6,6 @@
     <site url="http://m2eclipse.sonatype.org/sites/m2e"
         selected="true" name="M2Eclispe Update Site" />
 
-    <site url="http://servicemix.pl/ide/update/dependencies/" selected="true"
-        name="ServiceMix IDE (Dependencies)" />
-
     <site url="http://servicemix.pl/ide/update/dev/" selected="true"
         name="ServiceMix IDE Update Site (development snapshot)" />
 

diff --git a/update-site/pom.xml b/update-site/pom.xml
@@ -18,23 +18,6 @@
 
     <packaging>eclipse-update-site</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <projectnatures>
-                        <projectnature>org.eclipse.pde.UpdateSiteNature</projectnature>
-                    </projectnatures>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.pde.UpdateSiteBuilder</buildcommand>
-                    </buildcommands>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <id>upload</id>

diff --git a/update-site/site.xml b/update-site/site.xml
@@ -1,30 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.smxide.camel.feature_0.2.0.SNAPSHOT.jar" id="org.smxide.camel.feature" version="0.2.0.SNAPSHOT">
-      <category name="org.smxide"/>
-   </feature>
-   <feature url="features/org.smxide.common.feature_0.2.0.SNAPSHOT.jar" id="org.smxide.common.feature" version="0.2.0.SNAPSHOT">
-      <category name="org.smxide"/>
-   </feature>
-   <feature url="features/org.smxide.servicemix.feature_0.2.0.SNAPSHOT.jar" id="org.smxide.servicemix.feature" version="0.2.0.SNAPSHOT">
-      <category name="org.smxide"/>
-   </feature>
-   <feature url="features/org.smxide.activemq.feature_0.2.0.SNAPSHOT.jar" id="org.smxide.activemq.feature" version="0.2.0.SNAPSHOT">
-      <category name="org.smxide"/>
-   </feature>
-   <feature url="features/org.smxide.aries.feature_0.2.0.SNAPSHOT.jar" id="org.smxide.aries.feature" version="0.2.0.SNAPSHOT">
-      <category name="org.smxide"/>
-   </feature>
-   <feature url="features/org.smxide.karaf.feature_0.2.0.SNAPSHOT.jar" id="org.smxide.karaf.feature" version="0.2.0.SNAPSHOT">
-      <category name="org.smxide"/>
-   </feature>
-   <feature url="features/org.smxide.cxf.feature_0.2.0.SNAPSHOT.jar" id="org.smxide.cxf.feature" version="0.2.0.SNAPSHOT">
-      <category name="org.smxide"/>
-   </feature>
-
-   <category-def name="org.smxide" label="ServiceMix IDE">
-      <description>
-         ServiceMix IDE.
-      </description>
-   </category-def>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.smxide.camel.feature_0.0.0.jar" id="org.smxide.camel.feature" version="0.0.0">
+      <category name="org.smxide"/>
+   </feature>
+   <feature url="features/org.smxide.common.feature_0.0.0.jar" id="org.smxide.common.feature" version="0.0.0">
+      <category name="org.smxide"/>
+   </feature>
+   <feature url="features/org.smxide.servicemix.feature_0.0.0.jar" id="org.smxide.servicemix.feature" version="0.0.0">
+      <category name="org.smxide"/>
+   </feature>
+   <feature url="features/org.smxide.activemq.feature_0.0.0.jar" id="org.smxide.activemq.feature" version="0.0.0">
+      <category name="org.smxide"/>
+   </feature>
+   <feature url="features/org.smxide.aries.feature_0.0.0.jar" id="org.smxide.aries.feature" version="0.0.0">
+      <category name="org.smxide"/>
+   </feature>
+   <feature url="features/org.smxide.karaf.feature_0.0.0.jar" id="org.smxide.karaf.feature" version="0.0.0">
+      <category name="org.smxide"/>
+   </feature>
+   <feature url="features/org.smxide.cxf.feature_0.0.0.jar" id="org.smxide.cxf.feature" version="0.0.0">
+      <category name="org.smxide"/>
+   </feature>
+   <category-def name="org.smxide" label="ServiceMix IDE">
+      <description>
+         ServiceMix IDE.
+      </description>
+   </category-def>
+</site>