diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
index 61b7ad5b71d..cc5ceaf04c6 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
+++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
@@ -8,6 +8,7 @@ http://www.eclipse.org/legal/epl-v10.html
 
 Contributors: 
 Martin Oberhuber (Wind River) - initial API and implementation 
+Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
 -->
 <?eclipse version="3.1"?>
 <plugin>
@@ -42,16 +43,17 @@ Martin Oberhuber (Wind River) - initial API and implementation
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypeIds="org.eclipse.rse.examples.daytime.systemtype;org.eclipse.rse.systemtype.unix"
-			name="%DaytimeSubsystemName"
-			description="%DaytimeDescription"
-			iconlive="icons/full/obj16/daytimelive_obj.gif"
-			icon="icons/full/obj16/daytime_obj.gif"
-			category="daytime"
-			class="org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration"
-			vendor="%providerName"
-			priority="40000"
-			id="daytime.tcp">
+        category="daytime"
+        class="org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration"
+        description="%DaytimeDescription"
+        icon="icons/full/obj16/daytime_obj.gif"
+        iconlive="icons/full/obj16/daytimelive_obj.gif"
+        id="daytime.tcp"
+        name="%DaytimeSubsystemName"
+        priority="40000"
+        serviceType="_daytime._tcp"
+        systemTypeIds="org.eclipse.rse.examples.daytime.systemtype;org.eclipse.rse.systemtype.unix"
+        vendor="%providerName">
 		</configuration>
 	</extension>
 </plugin> 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml
index 468e68ee3a0..a15d97522e2 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml
@@ -12,7 +12,7 @@ Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
 Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
 
 Contributors:
-{Name} (company) - description of contribution.
+Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
 -->
 <?eclipse version="3.1"?>
 <plugin> 
@@ -21,31 +21,33 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix"
-            name="%Files"
-            description="%FilesDescription"
-            iconlive="icons/full/obj16/systemfileslive_obj.gif"
-            icon="icons/full/obj16/systemfiles_obj.gif"
             category="files"
             class="org.eclipse.rse.subsystems.files.dstore.DStoreFileSubSystemConfiguration"
-            vendor="%providerName"
+            description="%FilesDescription"
+            icon="icons/full/obj16/systemfiles_obj.gif"
+            iconlive="icons/full/obj16/systemfileslive_obj.gif"
+            id="dstore.files"
+            name="%Files"
             priority="100"
-            id="dstore.files">
+            serviceType="_dstore-files._tcp"
+            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix"
+            vendor="%providerName">
       </configuration>
 
-      <configuration 
-            systemTypeIds="org.eclipse.rse.systemtype.windows"
-            name="%Files"
-            description="%FilesDescription"
-            iconlive="icons/full/obj16/systemfileslive_obj.gif"
-            icon="icons/full/obj16/systemfiles_obj.gif"
+      <configuration
             category="files"
             class="org.eclipse.rse.subsystems.files.dstore.DStoreWindowsFileSubSystemConfiguration"
-            vendor="%providerName"
+            description="%FilesDescription"
+            icon="icons/full/obj16/systemfiles_obj.gif"
+            iconlive="icons/full/obj16/systemfileslive_obj.gif"
+            id="dstore.windows.files"
+            name="%Files"
             priority="100"
-            id="dstore.windows.files">
+            serviceType="_dstore-files-w._tcp"
+            systemTypeIds="org.eclipse.rse.systemtype.windows"
+            vendor="%providerName">
       </configuration>
 
       </extension>
 
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml
index 3131f3ef14b..5f07bb6225d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml
@@ -7,23 +7,25 @@ which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html 
 
 Contributors: 
-Martin Oberhuber - initial API and implementation 
+Martin Oberhuber - initial API and implementation
+Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
 -->
 <?eclipse version="3.1"?>
 <plugin>
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix;org.eclipse.rse.systemtype.ssh"
-			name="%SshFileSubsystemName"
-			description="%SshFileSubsystemDescription"
-			iconlive="icons/full/obj16/systemfileslive_obj.gif"
-			icon="icons/full/obj16/systemfiles_obj.gif"
-			category="files"
-			class="org.eclipse.rse.subsystems.files.ssh.SftpFileSubSystemConfiguration"
-			vendor="%providerName"
-            priority="100"
-			id="ssh.files">
+        category="files"
+        class="org.eclipse.rse.subsystems.files.ssh.SftpFileSubSystemConfiguration"
+        description="%SshFileSubsystemDescription"
+        icon="icons/full/obj16/systemfiles_obj.gif"
+        iconlive="icons/full/obj16/systemfileslive_obj.gif"
+        id="ssh.files"
+        name="%SshFileSubsystemName"
+        priority="100"
+        serviceType="_sftp-ssh._tcp"
+        systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix;org.eclipse.rse.systemtype.ssh"
+        vendor="%providerName">
 		</configuration>
 	</extension>
 </plugin>  
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml
index e7ffee75dff..0878b08ab3e 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml
@@ -12,7 +12,7 @@ Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
 Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
 
 Contributors:
-{Name} (company) - description of contribution.
+Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
 -->
 <?eclipse version="3.1"?>
 <plugin>
@@ -25,17 +25,18 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix"
-            name="%Processes"
-            description="%ProcessesDescription"
-            iconlive="icons/full/obj16/processsubsystemlive_obj.gif"
-            icon="icons/full/obj16/processsubsystem_obj.gif"
             category="processes"
             class="org.eclipse.rse.subsystems.processes.dstore.DStoreProcessSubSystemConfiguration"
-            vendor="%providerName"
+            description="%ProcessesDescription"
+            icon="icons/full/obj16/processsubsystem_obj.gif"
+            iconlive="icons/full/obj16/processsubsystemlive_obj.gif"
+            id="dstore.processes"
+            name="%Processes"
             priority="200"
-            id="dstore.processes">
+            serviceType="_dstore-proc._tcp"
+            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix"
+            vendor="%providerName">
       </configuration>
       </extension>
   
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml
index a6620801dca..ba6f2f6e4ef 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml
@@ -12,7 +12,7 @@ Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
 Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
 
 Contributors:
-{Name} (company) - description of contribution.
+Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
 -->
 <?eclipse version="3.1"?>
 <plugin>
@@ -22,17 +22,18 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows"
-            name="%Shells"
-            description="%ShellsDescription"
-            iconlive="icons/full/obj16/systemcommandslive_obj.gif"
-            icon="icons/full/obj16/systemcommands_obj.gif"
             category="shells"
             class="org.eclipse.rse.subsystems.shells.dstore.DStoreShellSubSystemConfiguration"
-            vendor="%providerName"
+            description="%ShellsDescription"
+            icon="icons/full/obj16/systemcommands_obj.gif"
+            iconlive="icons/full/obj16/systemcommandslive_obj.gif"
+            id="dstore.shells"
+            name="%Shells"
             priority="300"
-            id="dstore.shells">
+            serviceType="_dstore-shell._tcp"
+            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows"
+            vendor="%providerName">
          </configuration>
 
     </extension>
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml
index 76040e9b66b..ceb4a9eace2 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml
@@ -8,22 +8,24 @@ http://www.eclipse.org/legal/epl-v10.html
 
 Contributors: 
 Martin Oberhuber - initial API and implementation 
+Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
 -->
 <?eclipse version="3.1"?>
 <plugin>
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix;org.eclipse.rse.systemtype.ssh"
-			name="%SshShellSubsystemName"
-			description="%SshShellSubsystemDescription"
-			iconlive="icons/full/obj16/systemcommandslive_obj.gif"
-			icon="icons/full/obj16/systemcommands_obj.gif"
-			category="shells"
-			class="org.eclipse.rse.subsystems.shells.ssh.SshShellSubSystemConfiguration"
-			vendor="%providerName"
-			priority="300"
-			id="ssh.shells">
+        category="shells"
+        class="org.eclipse.rse.subsystems.shells.ssh.SshShellSubSystemConfiguration"
+        description="%SshShellSubsystemDescription"
+        icon="icons/full/obj16/systemcommands_obj.gif"
+        iconlive="icons/full/obj16/systemcommandslive_obj.gif"
+        id="ssh.shells"
+        name="%SshShellSubsystemName"
+        priority="300"
+        serviceType="_ssh._tcp"
+        systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix;org.eclipse.rse.systemtype.ssh"
+        vendor="%providerName">
 		</configuration>
 	</extension>