diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
index 5ee380b868f..5743ee48325 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ssh Plug-in
+Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.ssh; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.connectorservice.ssh.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services.ssh
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.connectorservice.ssh
+Bundle-Vendor: Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties
index 34d2e4d2dad..d24082bdba3 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties
+++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.properties,\
+               plugin.xml,\
+               icons/
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommands_obj.gif b/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommands_obj.gif
new file mode 100644
index 00000000000..061b6e226a9
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommands_obj.gif differ
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommandslive_obj.gif b/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommandslive_obj.gif
new file mode 100644
index 00000000000..3faca447424
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.connectorservice.ssh/icons/full/obj16/systemcommandslive_obj.gif differ
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties
index d6e46520e8f..089f97bafdd 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006 Wind River Systems, Inc.
+# Copyright (c) 2006 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 
@@ -9,7 +9,7 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-plugin.name = Ssh Connector Service Plugin
+plugin.name = RSE SSH Connector Service
 
 SshSystemName=SSH Only
 SshSystemDescription=Connection for SSH access to remote hosts
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
index 97d7c696e9f..553bdbb5157 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.services.ssh;singleton:=true
-Bundle-Version: 0.0.2
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.ssh.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/about.ini b/rse/plugins/org.eclipse.rse.services.ssh/about.ini
new file mode 100644
index 00000000000..c14b38f4c21
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.ssh/about.ini
@@ -0,0 +1,27 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%blurb
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=eclipse32.gif
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
+
+# Property "appName" contains name of the application (not translated)
+# needed for primary features only
+
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/about.mappings b/rse/plugins/org.eclipse.rse.services.ssh/about.mappings
new file mode 100644
index 00000000000..bddaab43109
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.ssh/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=@build@
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/about.properties b/rse/plugins/org.eclipse.rse.services.ssh/about.properties
new file mode 100644
index 00000000000..427608e7407
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.ssh/about.properties
@@ -0,0 +1,25 @@
+###############################################################################
+# Copyright (c) 2000, 2006 IBM Corporation 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:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# about.properties
+# contains externalized strings for about.ini
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# fill-ins are supplied by about.mappings
+# This file should be translated.
+#
+# Do not translate any values surrounded by {}
+
+blurb=Remote System Explorer SSH Services\n\
+\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+(c) Copyright Eclipse contributors and others 2000, 2006.  All rights reserved.\n\
+Visit http://www.eclipse.org/dsdp/tm
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/build.properties b/rse/plugins/org.eclipse.rse.services.ssh/build.properties
index 4c0e8fb61e4..b603bdc722b 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/build.properties
+++ b/rse/plugins/org.eclipse.rse.services.ssh/build.properties
@@ -1,10 +1,14 @@
-bin.includes = .classpath,\
-               .project,\
-               about.html,\
-               build.properties,\
+bin.includes = about.html,\
                icons/,\
                META-INF/,\
                plugin.properties,\
                plugin.xml,\
                readme.txt,\
-               src/
+               about.ini,\
+               about.mappings,\
+               about.properties,\
+               eclipse32.gif
+src.includes = readme.txt
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/eclipse32.gif b/rse/plugins/org.eclipse.rse.services.ssh/eclipse32.gif
new file mode 100644
index 00000000000..e6ad7ccd75b
Binary files /dev/null and b/rse/plugins/org.eclipse.rse.services.ssh/eclipse32.gif differ
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.services.ssh/plugin.properties
new file mode 100644
index 00000000000..7a0580320d8
--- /dev/null
+++ b/rse/plugins/org.eclipse.rse.services.ssh/plugin.properties
@@ -0,0 +1,12 @@
+################################################################################
+# Copyright (c) 2006 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 
+################################################################################
+
+plugin.name = RSE SSH Services
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF
index aa1306e3e46..22cdf248083 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ssh Plug-in
+Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.ssh; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.ssh.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.subsystems.files.ssh
+Bundle-Vendor: Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties
index 34d2e4d2dad..b0c7d260043 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               icons/,\
+               plugin.properties,\
+               plugin.xml
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties
index 76d03d380f9..d1a0cf9ddae 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006 Wind River Systems, Inc.
+# Copyright (c) 2006 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 
@@ -9,7 +9,7 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-plugin.name = Ssh Files Plugin
+plugin.name = RSE SSH Files
 
 SshFileSubsystemName=Sftp Files
 SshFileSubsystemDescription=Show Sftp Files on remote host.
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
index 1c67ac0c02a..6f98c44ec5e 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ssh Plug-in
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.ssh; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.shells.ssh.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.ui,
  com.jcraft.jsch
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.subsystems.shells.ssh
+Bundle-Vendor: Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties
index a882b3df9b0..830f1575168 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.properties
@@ -9,7 +9,7 @@
 # Martin Oberhuber - initial API and implementation 
 ################################################################################
 
-plugin.name = Ssh Shells Plugin
+plugin.name = RSE SSH Shells
 
 
 SshShellSubsystemName=Shells