diff --git a/org.eclipse.ptp.product-feature/feature.xml b/org.eclipse.ptp.product-feature/feature.xml
index d64bd5a..4d2cd71 100644
--- a/org.eclipse.ptp.product-feature/feature.xml
+++ b/org.eclipse.ptp.product-feature/feature.xml
@@ -31,7 +31,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.ptp.remote"
+         id="org.eclipse.remote"
          version="0.0.0"/>
 
    <includes
@@ -223,14 +223,28 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ptp.remote.core"
+         id="org.eclipse.remote.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ptp.remote.ui"
+         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"
diff --git a/org.eclipse.ptp.rcp.sysmon-feature/feature.xml b/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
index d5aaf20..8e3b9d5 100644
--- a/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
+++ b/org.eclipse.ptp.rcp.sysmon-feature/feature.xml
@@ -84,70 +84,28 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.ptp.remote.core"
+         id="org.eclipse.remote.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ptp.remote.remotetools.core"
+         id="org.eclipse.remote.jsch.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ptp.remote.remotetools.ui"
+         id="org.eclipse.remote.jsch.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ptp.remote.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.environment.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.environment.generichost"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.environment.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.preferences"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.remotetools.utils"
+         id="org.eclipse.remote.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF b/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF
index 74c5396..27d25bb 100644
--- a/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF
+++ b/org.eclipse.ptp.rcp.sysmon/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
  org.eclipse.debug.ui,
  org.eclipse.ptp.core,
  org.eclipse.ptp.launch,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui
+ org.eclipse.remote.core,
+ org.eclipse.remote.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java b/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java
index 8ab17b8..5eedbc9 100644
--- a/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java
+++ b/org.eclipse.ptp.rcp.sysmon/src/org/eclipse/ptp/rcp/sysmon/launch/ui/SysMonApplicationTab.java
@@ -31,10 +31,10 @@
 import org.eclipse.ptp.launch.RMLaunchUtils;
 import org.eclipse.ptp.launch.ui.LaunchImages;
 import org.eclipse.ptp.launch.ui.tabs.LaunchConfigurationTab;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.RemoteUIServices;
+import org.eclipse.remote.core.IRemoteConnection;
+import org.eclipse.remote.ui.IRemoteUIFileManager;
+import org.eclipse.remote.ui.IRemoteUIServices;
+import org.eclipse.remote.ui.RemoteUIServices;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
diff --git a/pom.xml b/pom.xml
index 5d5d12b..ea4f7f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
 		<!-->eclipse-site>http://download.eclipse.org/releases/${eclipse-release}</eclipse-site-->
 		<eclipse-site>http://download.eclipse.org/releases/kepler</eclipse-site>
 		<ptp-site>http://download.eclipse.org/tools/ptp/builds/${eclipse-release}/nightly</ptp-site>
+		<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/${eclipse-release}/nightly</remote-site>
 		<ptp-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/${eclipse-release}/nightly</ptp-install-dir>
 	</properties>
 
@@ -55,15 +56,13 @@
 			<url>${ptp-site}</url>
 			<layout>p2</layout>
 		</repository>
+		<repository>
+			<id>remote-${eclipse-release}</id>
+			<url>${remote-site}</url>
+			<layout>p2</layout>
+		</repository>
 	</repositories>
 	
-	<pluginRepositories>
-		<pluginRepository>
-			<id>maven.eclipse.org</id>
-			<url>http://maven.eclipse.org/nexus/content/repositories/milestone-indigo/</url>
-		</pluginRepository>
-	</pluginRepositories>
-  
 	<build>
 		<plugins>
 			<plugin>