diff --git a/org.eclipse.ptp.product-feature/feature.xml b/org.eclipse.ptp.product-feature/feature.xml
index a477772..f225b24 100644
--- a/org.eclipse.ptp.product-feature/feature.xml
+++ b/org.eclipse.ptp.product-feature/feature.xml
@@ -148,32 +148,17 @@
          id="org.eclipse.ptp.rdt.sync.fortran"
          version="0.0.0"/>
 
-   <requires>
-      <import feature="org.eclipse.cvs"/>
-      <import feature="org.eclipse.equinox.p2.user.ui"/>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.rcp"/>
-      <import feature="org.eclipse.cdt.platform"/>
-      <import feature="org.eclipse.cdt"/>
-      <import feature="org.eclipse.cdt.autotools"/>
-      <import feature="org.eclipse.cdt.debug.ui.memory"/>
-      <import feature="org.eclipse.cdt.core.parser.upc.feature"/>
-      <import feature="org.eclipse.cdt.xlc.feature"/>
-      <import feature="org.eclipse.cdt.bupc"/>
-      <import feature="org.eclipse.cdt.mylyn"/>
-      <import feature="org.eclipse.mylyn_feature"/>
-      <import feature="org.eclipse.mylyn.context_feature"/>
-      <import feature="org.eclipse.mylyn.team_feature"/>
-      <import feature="org.eclipse.mylyn.ide_feature"/>
-      <import feature="org.eclipse.mylyn.bugzilla_feature"/>
-      <import feature="org.eclipse.mylyn.wikitext_feature"/>
-      <import feature="org.eclipse.rse"/>
-      <import feature="org.eclipse.jgit"/>
-      <import feature="org.eclipse.wst.xml_ui.feature"/>
-      <import feature="org.eclipse.egit"/>
-      <import feature="org.eclipse.egit.import"/>
-   </requires>
+   <includes
+         id="org.eclipse.remote.proxy"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.remote.console"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.platform"
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ptp.core"
@@ -225,34 +210,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.remote.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.remote.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.remote.jsch.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.remote.jsch.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.ptp.ems.core"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.ptp.rcp.sysmon-feature/feature.xml b/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
index cc9498e..d875719 100644
--- a/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
+++ b/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
@@ -1209,4 +1209,37 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.remote.proxy.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.remote.proxy.protocol.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.remote.proxy.server.linux.x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.remote.proxy.server.macosx.x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.remote.proxy.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/pom.xml b/pom.xml
index 4190e76..4843e4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,10 +14,10 @@
 	<name>PTP Products</name>
 
 	<properties>
-		<ptp-version>neon/milestones</ptp-version>
-		<remote-version>neon/milestones</remote-version>
+		<ptp-version>nightly</ptp-version>
+		<remote-version>nightly</remote-version>
 		<tycho-version>1.0.0</tycho-version>
-		<eclipse-release>neon</eclipse-release>
+		<eclipse-release>oxygen</eclipse-release>
 		<!-->eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site-->
 		<eclipse-site>http://download.eclipse.org/staging/${eclipse-release}</eclipse-site>
 		<ptp-site>http://download.eclipse.org/tools/ptp/builds/${ptp-version}</ptp-site>