diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.properties
index 5541b7eae8d..be1c79967d3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.properties
@@ -1,13 +1,13 @@
 ################################################################################
-# Copyright (c) 2006 Wind River Systems, Inc.
+# Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
 # http://www.eclipse.org/legal/epl-v10.html 
 # 
 # Contributors: 
-# Martin Oberhuber - initial API and implementation 
-# Sheldon D'souza - Changes to strings
+# Martin Oberhuber (Wind River) - initial API and implementation 
+# Sheldon D'souza (Celunite) - Changes to strings
 ################################################################################
 
 # NLS_MESSAGEFORMAT_NONE
@@ -16,5 +16,8 @@
 pluginName = RSE Telnet Shells
 providerName = Eclipse.org
 
+TelnetSystemLabel=Telnet Only
+TelnetSystemDescription=Connection for Telnet access to remote systems
+
 TelnetShellSubsystemName=Telnet Shells
 TelnetShellSubsystemDescription=Work with shells and commands on remote systems using the Telnet protocol.
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.xml
index 04aa11a5ce5..78eb8efeab4 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2006, 2007 Wind River Systems, Inc.
+Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
 All rights reserved. This program and the accompanying materials 
 are made available under the terms of the Eclipse Public License v1.0 
 which accompanies this distribution, and is available at 
@@ -11,10 +11,19 @@ Martin Oberhuber - initial API and implementation
 -->
 <?eclipse version="3.1"?>
 <plugin>
+	<extension point="org.eclipse.rse.core.systemTypes">
+		<systemType
+		      label="%TelnetSystemLabel"
+        	description="%TelnetSystemDescription"
+            icon="icons/full/obj16/systemcommands_obj.gif"
+            iconLive="icons/full/obj16/systemcommandslive_obj.gif"
+        	id="org.eclipse.rse.systemtype.telnet"
+	        name="Telnet Only"/>
+	</extension>
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix"
+			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix;org.eclipse.rse.systemtype.telnet"
 			name="%TelnetShellSubsystemName"
 			description="%TelnetShellSubsystemDescription"
 			iconlive="icons/full/obj16/systemcommandslive_obj.gif"