diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 440de460ba1..4daa6993aee 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -59,12 +59,12 @@
         
         <!-- Set up the default target platform to build against -->
         <license-site>http://download.eclipse.org/cbi/updates/license</license-site>
-        <platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
-        <platform-release-site>http://download.eclipse.org/releases/neon</platform-release-site>
+        <platform-site>http://download.eclipse.org/eclipse/updates/4.7milestones</platform-site>
+        <platform-release-site>http://download.eclipse.org/staging/oxygen</platform-release-site>
 		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository</orbit-site>
         <cdt-site>http://download.eclipse.org/tools/cdt/builds/neon/milestones</cdt-site>
-        <rse-site>http://download.eclipse.org/tm/updates/4.0</rse-site>
-        <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
+        <rse-site>http://download.eclipse.org/tm/updates/4.1milestones</rse-site>
+        <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
         <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
         <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
       </properties>
@@ -187,6 +187,21 @@
                 <cdt-site>http://download.eclipse.org/tools/cdt/releases/8.7</cdt-site>
             </properties>
         </profile>
+        <profile>
+            <!-- Eclipse 4.6.x (Neon) -->
+            <id>neon</id>
+            
+            <properties>
+                <terminal-stream>neon</terminal-stream>
+                <sdk-version>4.6</sdk-version>
+                <!-- Replace with updates/4.6 after Neon.2 -->
+                <platform-site>http://download.eclipse.org/eclipse/updates/4.6-M-builds</platform-site>
+                <!-- Replace with releases/neon after Neon.2 -->
+                <platform-release-site>http://download.eclipse.org/staging/${terminal-stream}</platform-release-site>
+                <!-- Replace with cdt/releases/9.0 (or 9.1 or 9.2) after Neon.2 -->
+                <cdt-site>http://download.eclipse.org/tools/cdt/builds/neon/milestones</cdt-site>
+            </properties>
+        </profile>
     </profiles>
     
     <build>
diff --git a/admin/target-defs/eclipse-4.6.x-neon.target b/admin/target-defs/eclipse-4.6.x-neon.target
index 942ae86493a..0ecd7d31223 100644
--- a/admin/target-defs/eclipse-4.6.x-neon.target
+++ b/admin/target-defs/eclipse-4.6.x-neon.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.6.x (Neon)" sequenceNumber="103">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.6.x (Neon)" sequenceNumber="104">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -10,6 +10,11 @@
 <repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.test.feature.group" version="3.7.100.v20160503-1715"/>
+<unit id="org.eclipse.sdk.ide" version="4.6.0.I20160606-1100"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201505221634"/>
 <repository location="http://download.eclipse.org/tm/updates/4.0"/>
 </location>
@@ -21,9 +26,9 @@
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.test.feature.group" version="3.7.100.v20160503-1715"/>
-<unit id="org.eclipse.sdk.ide" version="4.6.0.I20160606-1100"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
+<unit id="org.eclipse.remote.feature.group" version="2.1.0.201605242106"/>
+<unit id="org.eclipse.remote.source.feature.group" version="2.1.0.201605242106"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/2.1.0"/>
 </location>
 </locations>
 </target>
diff --git a/admin/target-defs/eclipse-4.7.x-oxygen.target b/admin/target-defs/eclipse-4.7.x-oxygen.target
new file mode 100644
index 00000000000..2283bb760c6
--- /dev/null
+++ b/admin/target-defs/eclipse-4.7.x-oxygen.target
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Terminals Eclipse 4.7.x (Oxygen)" sequenceNumber="4">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
+<repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.test.feature.group" version="3.7.100.v20160912-1145"/>
+<unit id="org.eclipse.sdk.ide" version="4.7.0.I20160915-0230"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.7milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.1.201603211627"/>
+<repository location="http://download.eclipse.org/tm/updates/4.1milestones"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jgit.feature.group" version="4.4.1.201607150455-r"/>
+<unit id="org.eclipse.egit.feature.group" version="4.4.1.201607150455-r"/>
+<unit id="org.eclipse.cdt.sdk.feature.group" version="9.0.0.201606062011"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
+<repository location="http://download.eclipse.org/staging/oxygen"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="2.1.0.201605242106"/>
+<unit id="org.eclipse.remote.source.feature.group" version="2.1.0.201605242106"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
+</location>
+</locations>
+</target>