diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 71a6610..cc260cd 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -80,7 +80,7 @@
       The tycho-eclipserun-plugin will create its instance of Eclipse from this
       'eclipiserun-repo' repository, such as for computing .api-descriptions.
     -->
-    <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.6milestones/S-4.6RC2-201605191730/</eclipserun-repo>
+    <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.6/R-4.6-201606061100/</eclipserun-repo>
 
     <comparator.repo>http://download.eclipse.org/eclipse/updates/4.6-I-builds</comparator.repo>
 
@@ -253,6 +253,11 @@
           </target>
           <environments>
             <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+            <environment>
               <os>linux</os>
               <ws>gtk</ws>
               <arch>x86</arch>
@@ -480,13 +485,13 @@
           <configuration>
             <strictBinIncludes>false</strictBinIncludes>
             <format>${qualifier.format}</format>
-            <timestampProvider>jgit</timestampProvider>
+            <!-- timestampProvider>jgit</timestampProvider -->
             <jgit.ignore>
               pom.xml
             </jgit.ignore>
             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
             <sourceReferences>
-              <generate>true</generate>
+              <generate>false</generate>
             </sourceReferences>
             <archive>
               <addMavenDescriptor>false</addMavenDescriptor>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index 7e6fd26..f1773e0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -139,6 +139,11 @@
           <resolver>p2</resolver>
           <environments>
             <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+            <environment>
               <os>linux</os>
               <ws>gtk</ws>
               <arch>x86</arch>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index c7f7ca9..1387a12 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -44,6 +44,11 @@
           <resolver>p2</resolver>
           <environments>
             <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+            <environment>
               <os>linux</os>
               <ws>gtk</ws>
               <arch>x86</arch>
@@ -99,6 +106,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
index 2bc2ddf..96b6c41 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
@@ -15,6 +15,8 @@
     <property name="archiveRoot" value="launchers" />
     <buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" />
     <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
+    <buildRepos os="freebsd" ws="gtk" arch="x86" archiveName="${archiveRoot}-freebsd.gtk.x86.${buildId}.tar.gz" />
+    <buildRepos os="freebsd" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-freebsd.gtk.x86_64.${buildId}.tar.gz" />
     <buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" />
     <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
       <buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
index 129d0a6..a8f76b6 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
@@ -278,6 +278,16 @@
         fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" />
       <platform
         format="equinox"
+        id="SFG2"
+        name="FreeBSD (x86/GTK+)"
+        fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" />
+      <platform
+        format="equinox"
+        id="SFG264"
+        name="FreeBSD (x86_64/GTK+)"
+        fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" />
+      <platform
+        format="equinox"
         id="SLG2"
         name="Linux (x86/GTK+)"
         fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" />
@@ -346,6 +356,16 @@
         fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" />
       <platform
         format="equinox"
+        id="ESFG2"
+        name="FreeBSD (x86/GTK+)"
+        fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" />
+      <platform
+        format="equinox"
+        id="ESFG264"
+        name="FreeBSD (x86_64/GTK+)"
+        fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" />
+      <platform
+        format="equinox"
         id="ESLG2"
         name="Linux (x86/GTK+)"
         fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index c2f679b..742fe0b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -55,6 +55,23 @@ units.3.touchpoint.version=1.0.0
 units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
 units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
 
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
+requires.4.range=[1.0.0,1.0.0]
+requires.4.greedy=true
+
+units.4.id=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
+units.4.version=1.0.0
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
+units.4.provides.1.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
+units.4.provides.1.version=1.0.0
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi
+units.4.touchpoint.version=1.0.0
+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
+
 # Restrict range so we are not an automatic update for 3.x.
 update.id = org.eclipse.platform.ide
 update.range = [4.0,$version$)
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
index 502b599..5b885e5 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -76,6 +76,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
@@ -87,6 +88,19 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <environments>
+            <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+          </environments>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <profiles>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index a8a32d0..2ab8a62 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -39,6 +39,60 @@
           <format>'${buildId}'</format>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-director-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>materialize-products</id>
+            <goals>
+              <goal>materialize-products</goal>
+            </goals>
+            <configuration>
+              <profile>SDKProfile</profile>
+              <products>
+                <product>
+                  <id>org.eclipse.platform.sdk</id>
+                  <rootFolder>eclipse</rootFolder>
+                   <rootFolders>
+                     <macosx>Eclipse.app</macosx>
+                   </rootFolders>
+                </product>
+              </products>
+            </configuration>
+          </execution>
+          <execution>
+            <id>archive-products</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>archive-products</goal>
+            </goals>
+            <configuration>
+              <formats>
+                <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
+                <linux>tar.gz</linux>
+                <macosx>tar.gz</macosx>
+              </formats>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <environments>
+            <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+          </environments>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index f34ae99..6293698 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -9,56 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-#root.permissions.755=eclipse
-root.win32.win32.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86
-root.win32.win32.x86.permissions.755=eclipse.exe
-root.win32.win32.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64
-root.win32.win32.x86_64.permissions.755=eclipse.exe
- 
-# Care is need there, for "macosx", as several forms will appear to work, but end up
-# having wrong value in the CFBundleIdentifier field, in the Info.plist, resulting 
-# in "application requires Java 6" (see bug 445026, and bug 457071)
-# These are not required at all, for our "product build", but are to get 
-# configuration_roots complete (see bug 457071).
-root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64
-root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
-#root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
-
-# from org.eclipse.equinox.core.feature
-#root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe
-#root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe
-
-root.aix.gtk.ppc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/aix/ppc
-root.aix.gtk.ppc.permissions.755=eclipse
-root.aix.gtk.ppc64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/aix/ppc64
-root.aix.gtk.ppc64.permissions.755=eclipse
-
-root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
-root.linux.gtk.ppc64le.permissions.755=eclipse
-
-root.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64
-root.hpux.gtk.ia64.permissions.755=eclipse
-
-root.solaris.gtk.sparcv9=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparcv9
-root.solaris.gtk.sparcv9.permissions.755=eclipse
-root.solaris.gtk.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86_64
-root.solaris.gtk.x86_64.permissions.755=eclipse
-
-root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
-root.linux.gtk.x86.permissions.755=eclipse
-root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
-root.linux.gtk.ppc.permissions.755=eclipse
-root.linux.gtk.ppc64=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64
-root.linux.gtk.ppc64.permissions.755=eclipse
-root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
-root.linux.gtk.x86_64.permissions.755=eclipse
-
-root.linux.gtk.s390x=rootfiles/linux.gtk.s390x,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
-root.linux.gtk.s390x.permissions.755=eclipse
-root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
-root.linux.gtk.s390.permissions.755=eclipse
-
+root.freebsd.gtk.%%ECLIPSE_ARCH%%=rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/%%ECLIPSE_ARCH%%
+root.freebsd.gtk.%%ECLIPSE_ARCH%%.permissions.755=eclipse
 
 bin.includes = feature.properties
 
-
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index 29be78c..207a934 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -72,6 +72,7 @@
             <configuration>
               <formats>
                 <win32>zip</win32>
+                <freebsd>tar.gz</freebsd>
                 <linux>tar.gz</linux>
                 <macosx>tar.gz</macosx>
               </formats>
@@ -85,6 +86,20 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <environments>
+            <environment>
+              <os>freebsd</os>
+              <ws>gtk</ws>
+              <arch>%%ECLIPSE_ARCH%%</arch>
+            </environment>
+          </environments>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
@@ -35,6 +35,6 @@
     <module>platform.sdk</module>
     <module>sdk</module>
-    <module>eclipse-junit-tests</module>
+    <!-- module>eclipse-junit-tests</module -->
-    <module>eclipse.platform.repository</module>
+    <!-- module>eclipse.platform.repository</module -->
   </modules>
 </project>