diff --git a/bundles/org.eclipse.build.tools/.classpath b/bundles/org.eclipse.build.tools/.classpath
index b5d1783..64c5e31 100644
--- a/bundles/org.eclipse.build.tools/.classpath
+++ b/bundles/org.eclipse.build.tools/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="buildTools.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF
index 18b1196..fed22eb 100644
--- a/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
 Require-Bundle: org.apache.ant,
  org.eclipse.osgi
 Bundle-ClassPath: buildTools.jar
+Bundle-Vendor: %Bundle-Vendor
diff --git a/bundles/org.eclipse.build.tools/build.properties b/bundles/org.eclipse.build.tools/build.properties
index 7433630..a5979d9 100644
--- a/bundles/org.eclipse.build.tools/build.properties
+++ b/bundles/org.eclipse.build.tools/build.properties
@@ -3,6 +3,5 @@
                plugin.xml,\
                buildTools.jar,\
                about.html
-jars.compile.order = buildTools.jar
 source.buildTools.jar = src/
-output.buildTools.jar = bin/
+src.includes = about.html
diff --git a/bundles/org.eclipse.build.tools/buildTools.jar b/bundles/org.eclipse.build.tools/buildTools.jar
index 01f02b0..ac82d5c 100644
--- a/bundles/org.eclipse.build.tools/buildTools.jar
+++ b/bundles/org.eclipse.build.tools/buildTools.jar
Binary files differ
diff --git a/bundles/org.eclipse.build.tools/plugin.properties b/bundles/org.eclipse.build.tools/plugin.properties
index 1f7af99..ff85ea7 100644
--- a/bundles/org.eclipse.build.tools/plugin.properties
+++ b/bundles/org.eclipse.build.tools/plugin.properties
@@ -1,2 +1,3 @@
 
-Bundle-Name = Ant tasks used during platform builds
\ No newline at end of file
+Bundle-Name = Ant tasks used during platform builds
+Bundle-Vendor = Eclipse Platform Releng
\ No newline at end of file
diff --git a/bundles/org.eclipse.build.tools/pom.xml b/bundles/org.eclipse.build.tools/pom.xml
index b75509c..39e4cdf 100644
--- a/bundles/org.eclipse.build.tools/pom.xml
+++ b/bundles/org.eclipse.build.tools/pom.xml
@@ -1,15 +1,17 @@
 <?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"
+<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.platform</groupId>
-    <artifactId>bundles</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.eclipse.platform</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
 
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.build.tools</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+    </parent>
+    <groupId>org.eclipse.platform</groupId>
+    <artifactId>org.eclipse.build.tools</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.releng.build.tools.convert/convert.jar b/bundles/org.eclipse.releng.build.tools.convert/convert.jar
index 694d875..0cff088 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/convert.jar
+++ b/bundles/org.eclipse.releng.build.tools.convert/convert.jar
Binary files differ
diff --git a/bundles/org.eclipse.releng.build.tools.convert/pom.xml b/bundles/org.eclipse.releng.build.tools.convert/pom.xml
index c2d7765..b841be4 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/pom.xml
+++ b/bundles/org.eclipse.releng.build.tools.convert/pom.xml
@@ -1,15 +1,17 @@
 <?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"
+<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.platform</groupId>
-    <artifactId>bundles</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.eclipse.platform</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
 
-  </parent>
-  <groupId>org.eclipse.platform</groupId>
-  <artifactId>org.eclipse.releng.build.tools.convert</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+    </parent>
+    <groupId>org.eclipse.platform</groupId>
+    <artifactId>org.eclipse.releng.build.tools.convert</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index 145b63e..3753ee4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,13 +25,74 @@
         <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
         <buildType>I</buildType>
         <buildId>${buildType}${buildTimestamp}</buildId>
+
+        <maven.test.skip>true</maven.test.skip>
+        <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+        <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
+        <buildType>I</buildType>
+        <buildId>${buildType}${buildTimestamp}</buildId>
+        <comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-I-builds</comparator.repo>
+        <egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
+        <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
+        <cbi-jdt-version>3.9.0.v20130313-2254</cbi-jdt-version>
+        <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
+        <eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
+        <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/4.3-I-builds</eclipse-p2-repo.url>
+
+
+        <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.buildtools</tycho.scmUrl>
+
+
     </properties>
     <modules>
         <module>features</module>
         <module>bundles</module>
         <module>repository</module>
     </modules>
-
+    <pluginRepositories>
+        <pluginRepository>
+            <id>tycho</id>
+            <url>${tycho-repo.url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>cbi-jdt</id>
+            <url>${cbi-jdt-repo.url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>eclipse</id>
+            <url>${eclipse-repo.url}</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>cbi-snapshots</id>
+            <url>${cbi-snapshots-repo.url}</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
     <repositories>
         <repository>
             <id>eclipse-platform-repository</id>
@@ -47,6 +108,23 @@
                 <version>${tycho.version}</version>
                 <extensions>true</extensions>
             </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-source-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>plugin-source</id>
+                        <goals>
+                            <goal>plugin-source</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -60,7 +138,18 @@
                         </archive>
                     </configuration>
                 </plugin>
-
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-source-plugin</artifactId>
+                    <version>${tycho.version}</version>
+                    <configuration>
+                        <distinctSourceRoots>true</distinctSourceRoots>
+                        <strictSrcIncludes>false</strictSrcIncludes>
+                        <archive>
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.eclipse.tycho.extras</groupId>
                     <artifactId>tycho-custom-bundle-plugin</artifactId>
@@ -80,6 +169,64 @@
                         </baselineRepositories>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-compiler-plugin</artifactId>
+                    <version>${tycho.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.eclipse.jdt</groupId>
+                            <artifactId>org.eclipse.jdt.core</artifactId>
+                            <version>${cbi-jdt-version}</version>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <compilerArgument>-warn:-deprecation,raw,unchecked</compilerArgument>
+                        <compilerArguments>
+                            <verbose />
+                            <inlineJSR />
+                            <enableJavadoc />
+                            <encoding>${project.build.sourceEncoding}</encoding>
+                            <proceedOnError />
+                            <log>${project.build.directory}/@dot.xml</log>
+                        </compilerArguments>
+                        <showWarnings>true</showWarnings>
+                        <excludeResources>
+                            <exclude>**/package.html</exclude>
+                        </excludeResources>
+                    </configuration>
+                </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-extras.version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.eclipse.tycho.extras</groupId>
+                            <artifactId>tycho-sourceref-jgit</artifactId>
+                            <version>${tycho-extras.version}</version>
+                        </dependency>
+                    </dependencies>
+                    <configuration>
+                        <strictBinIncludes>false</strictBinIncludes>
+                        <format>'v'yyyyMMdd-HHmm</format>
+                        <timestampProvider>jgit</timestampProvider>
+                        <jgit.ignore>
+                            pom.xml
+                        </jgit.ignore>
+                        <sourceReferences>
+                            <generate>true</generate>
+                        </sourceReferences>
+                        <archive>
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>