diff --git a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
index cee9214b6ad..f3123d1a9fe 100644
--- a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.discovery;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.discovery.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.tm.discovery.wizard;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.tm.discovery.model;bundle-version="[2.0.0,3.0.0)"
diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml
index 49892d96404..60b76eb5e32 100644
--- a/discovery/org.eclipse.tm.discovery-feature/feature.xml
+++ b/discovery/org.eclipse.tm.discovery-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.discovery"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.tm.discovery.engine"
       image="eclipse_update_120.jpg">
@@ -20,8 +20,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
diff --git a/discovery/org.eclipse.tm.discovery.doc.isv/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.doc.isv/META-INF/MANIFEST.MF
index 8b3cdaf02ca..918b9428e55 100644
--- a/discovery/org.eclipse.tm.discovery.doc.isv/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.discovery.doc.isv;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Eclipse-LazyStart: false
 Bundle-Vendor: %providerName
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 7cc9e06290c..a19381d732e 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -146,43 +146,43 @@
    </category-def>
 <!-- END_2_0_1_patches -->
 <!-- BEGIN_3_0 -->
-   <feature url="features/org.eclipse.rse.core_2.0.1.qualifier.jar" id="org.eclipse.rse.core" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.core_3.0.0.qualifier.jar" id="org.eclipse.rse.core" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.1.qualifier.jar" id="org.eclipse.rse.dstore" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.dstore_3.0.0.qualifier.jar" id="org.eclipse.rse.dstore" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.1.qualifier.jar" id="org.eclipse.rse.ftp" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.ftp_3.0.0.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.1.qualifier.jar" id="org.eclipse.rse.local" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.local_3.0.0.qualifier.jar" id="org.eclipse.rse.local" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse_2.0.1.qualifier.jar" id="org.eclipse.rse" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse_3.0.0.qualifier.jar" id="org.eclipse.rse" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.sdk_2.0.1.qualifier.jar" id="org.eclipse.rse.sdk" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.sdk_3.0.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.1.qualifier.jar" id="org.eclipse.rse.ssh" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.ssh_3.0.0.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.0.1.qualifier.jar" id="org.eclipse.rse.telnet" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.telnet_3.0.0.qualifier.jar" id="org.eclipse.rse.telnet" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.examples_2.0.0.qualifier.jar" id="org.eclipse.rse.examples" version="2.0.0.qualifier">
+   <feature url="features/org.eclipse.rse.examples_3.0.0.qualifier.jar" id="org.eclipse.rse.examples" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.0.1.qualifier.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.remotecdt_3.0.0.qualifier.jar" id="org.eclipse.rse.remotecdt" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.tm.discovery_2.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="2.0.0.qualifier">
+   <feature url="features/org.eclipse.tm.discovery_3.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.1.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.1.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.1.qualifier.jar" id="org.eclipse.rse.tests" version="2.0.1.qualifier">
+   <feature url="features/org.eclipse.rse.tests_3.0.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>
    </feature>
    <category-def name="TM and RSE 3.0" label="TM and RSE 3.0">
diff --git a/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
index 693e90b23af..0bb84b651b6 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
+++ b/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.doc.isv; singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Eclipse-LazyStart: false
 Bundle-Vendor: %providerName
diff --git a/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
index b9b6ec06009..9e64159310a 100755
--- a/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
+++ b/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.doc.user; singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-LazyStart: false
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index 03ff944e7ab..ad18a76d170 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.examples"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.examples.tutorial"
       image="eclipse_update_120.jpg">
@@ -20,8 +20,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
@@ -30,11 +30,11 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.files.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.shells.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.files.ui" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.shells.ui" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
index f1c073746f2..aea3beebf75 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.examples.daytime;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.examples.daytime.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.core.runtime
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
index 082321d0f1f..ac4d645a735 100644
--- a/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.examples.tutorial;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: samples.RSESamplesPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,12 +10,12 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.shells.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.files.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.shells.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
index 4de723ce88b..3b004092816 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.remotecdt;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.remotecdt.Activator
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.cdt.launch,
  org.eclipse.cdt.debug.mi.core,
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.cdt.debug.mi.ui,
  org.eclipse.cdt.debug.ui,
- org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.files.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index b66cdeb29d8..9fc88598887 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse"
       image="eclipse_update_120.jpg">
@@ -20,8 +20,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index af40c853c78..95140b7da97 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.core"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.core">
 
@@ -19,8 +19,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index 952f50da2d7..7b9a62bb0e7 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.dstore"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.dstore">
 
@@ -19,8 +19,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
@@ -29,10 +29,10 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.processes.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.processes.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index b16c3e8686b..34feda4cc36 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.ftp"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.files.ftp">
 
@@ -19,8 +19,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
@@ -31,9 +31,8 @@
       <import plugin="org.apache.oro" version="2.0.8" match="equivalent"/>
       <import plugin="org.apache.commons.net" version="1.4.1" match="compatible"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.services.files.ftp" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index c6befdbc06e..1715879b488 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.local"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.local">
 
@@ -19,18 +19,18 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.processes.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.processes.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
index d2f92636264..1d3bbf44450 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.remotecdt"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.remotecdt"
       image="eclipse_update_120.jpg">
@@ -20,8 +20,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
@@ -37,10 +37,10 @@
       <import plugin="org.eclipse.cdt.debug.ui"/>
       <import plugin="org.eclipse.cdt.launch"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.files.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.files.ui" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index c225996cb72..befdfe91f3d 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.sdk"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -19,8 +19,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index 1c0ee40e4fd..6c064166b5e 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.ssh"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.ssh">
 
@@ -19,8 +19,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
@@ -29,10 +29,10 @@
       <import plugin="org.eclipse.jsch.core" version="1.0.0" match="compatible"/>
       <import plugin="com.jcraft.jsch" version="0.1.31" match="compatible"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index 4e4d66ce358..af1d2e878d3 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.telnet"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.telnet">
 
@@ -19,18 +19,18 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.shells.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.shells.ui" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
index e41b03417bb..ac0a71b974f 100644
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dstore.core
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Activator: org.eclipse.dstore.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
index b42c7c6a613..24e214f27fa 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.dstore
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.connectorservice.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: 
  org.eclipse.rse.connectorservice.dstore,
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
index 41be16c2349..dc8917371b7 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.local
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.connectorservice.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.connectorservice.local;x-friends:="org.eclipse.rse.subsystems.files.local,org.eclipse.rse.subsystems.processes.local,org.eclipse.rse.subsystems.shells.local"
 Bundle-Vendor: %providerName
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 9ee6b12dcbb..ff9a954fe15 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
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.ssh; singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.connectorservice.ssh.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.services.ssh;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui,
  com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)",
  org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)"
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF
index 596d4b791b7..63b3c9b5f20 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.telnet/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.services.telnet;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui,
  org.apache.commons.net;bundle-version="[1.4.1,2.0.0)"
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
index f34af289dd3..ec3c57bcf2b 100644
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
index be62635628b..7579806287b 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.dstore.security; singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.dstore.security.UniversalSecurityPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -10,14 +10,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.dstore;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.dstore;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.processes.dstore;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.dstore;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.dstore;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.processes.dstore;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
index 2696aa4be93..2c2e4b6a189 100644
--- a/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.efs.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.efs.ui;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.efs;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.files.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.efs;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.ide,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF
index e06144acbd8..85cf3b5825e 100644
--- a/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.efs/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.efs;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.efs.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.filesystem,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
index caa760fb647..12ca2863269 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.files.ui;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.files.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -15,10 +15,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.search,
  org.eclipse.compare,
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.files.ui,
  org.eclipse.rse.files.ui.actions,
diff --git a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
index 262d6b31bf1..a5618d3cee7 100644
--- a/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.importexport/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.files.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
index ef3a8834120..bcd54fff5c3 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
@@ -2,30 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.processes.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.processes.ui.ProcessesPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
  org.eclipse.debug.core,
  org.eclipse.ui.workbench.texteditor,
+ org.eclipse.jface,
  org.eclipse.jface.text,
  org.eclipse.search,
  org.eclipse.compare,
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jface,
- org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui,
  org.eclipse.ui.views,
- org.eclipse.core.runtime,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Export-Package: org.eclipse.rse.internal.processes.ui;x-internal:=true,
  org.eclipse.rse.internal.processes.ui.actions;x-internal:=true,
  org.eclipse.rse.internal.processes.ui.dialogs;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
index 8ecdc8478cf..167f0f3a992 100644
--- a/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.sdk
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
index edd98335348..e7e236af6ae 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services.dstore
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Activator: org.eclipse.rse.internal.services.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
index b8010f4bf68..09d18b83026 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services.files.ftp;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.services.files.ftp.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.apache.commons.net;bundle-version="[1.4.1,2.0.0)";visibility:="reexport",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.services.files.ftp;x-friends:="org.eclipse.rse.subsystems.files.ftp",
  org.eclipse.rse.internal.services.files.ftp.parser;x-friends:="org.eclipse.rse.subsystems.files.ftp"
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
index 6214c772f06..50b11e7a2da 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.shells.ui;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.shells.ui.ShellsUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,
  org.eclipse.ui.forms,
  org.eclipse.ui.ide,
- org.eclipse.rse.files.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.files.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.shells.ui;x-internal:=true,
  org.eclipse.rse.internal.shells.ui.actions;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
index 5794e2f967e..d8a18232c01 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.core
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.files.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.core;x-friends:="org.eclipse.rse.subsystems.files.dstore,org.eclipse.rse.subsystems.files.local",
  org.eclipse.rse.internal.subsystems.files.core.model;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
index 79d6b744a56..7605927cd80 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.dstore;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.files.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -10,11 +10,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.connectorservice.dstore;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.dstore;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.dstore;x-internal:=true,
  org.eclipse.rse.subsystems.files.dstore
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
index cd86897da47..e41c48ece80 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.ftp;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.files.ftp.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.console,
- org.eclipse.rse.services.files.ftp;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.services.files.ftp;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.ftp;x-internal:=true,
  org.eclipse.rse.internal.subsystems.files.ftp.connectorservice;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
index eb18743e0c1..61370f8f184 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.local;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.files.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.rse.services.local;bundle-version="[2.0.1,3.0.0)",
- org.eclipse.rse.connectorservice.local;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.connectorservice.local;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.files.local;x-internal:=true,
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 399dfc15a2c..48f39b7f306 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
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.ssh; singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.files.ssh.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.connectorservice.ssh;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.ssh;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services.ssh;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.files.ssh;x-internal:=true,
  org.eclipse.rse.subsystems.files.ssh
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
index 72d5e2335cf..6a6e2ad4c09 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.core;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 
@@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.swt,
  org.eclipse.ui,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.core.Activator
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
index 84ff4b1ad72..294acb2fd93 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.dstore;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -11,10 +11,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.connectorservice.dstore;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.connectorservice.dstore;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
index 4486d0951f7..08b669000cb 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.local;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.rse.services.local;bundle-version="[2.0.1,3.0.0)",
- org.eclipse.rse.connectorservice.local;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.connectorservice.local;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.processes.local;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF
index 5cef4072faf..8273fced3a4 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Bundle-Activator: org.eclipse.rse.internal.subsystems.processes.shell.linux.Acti
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.processes.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.processes.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
index b899a18a98e..53a779f3583 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.core
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.core.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources,
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.shells.core;x-internal:=true,
  org.eclipse.rse.internal.subsystems.shells.servicesubsystem;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
index c7034cf571f..eedfb652482 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.dstore;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -11,11 +11,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services.dstore;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.dstore.extra;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.connectorservice.dstore;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.connectorservice.dstore;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.shells.dstore;x-internal:=true,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
index 219748437fb..c55574318f3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.local;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.rse.services.local;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.connectorservice.local;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.connectorservice.local;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.internal.subsystems.shells.local;x-internal:=true,
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 db49893d5f1..6c18cb4d30d 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,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.ssh; singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.ssh.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.connectorservice.ssh;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.connectorservice.ssh;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services.ssh;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.subsystems.shells.ssh;x-internal:=true,
  org.eclipse.rse.subsystems.shells.ssh
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
index 1e766af70b9..ad3f48e15fa 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
@@ -10,11 +10,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.rse.connectorservice.telnet;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.rse.services.telnet;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.shells.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.shells.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Export-Package: org.eclipse.rse.internal.subsystems.shells.telnet;x-internal:=true,
  org.eclipse.rse.subsystems.shells.telnet
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
index 2c37dad83ab..795eafcac8f 100644
--- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.ui;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.ui.RSEUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.forms,
  org.eclipse.ui.ide,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
 Import-Package: com.ibm.icu.lang,
  com.ibm.icu.text,
  com.ibm.icu.util
diff --git a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
index aad0786ea00..8d0f795cd8c 100644
--- a/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.useractions/META-INF/MANIFEST.MF
@@ -12,12 +12,12 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.ide,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.shells.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.shells.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.internal.useractions,
  org.eclipse.rse.internal.useractions.files.compile,
diff --git a/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF
index c1a6a959dc0..c2fefbabb74 100644
--- a/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index 3e311f1167d..09039578e69 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.tests"
       label="%featureName"
-      version="2.0.1.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,23 +18,23 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.rse.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.rse.tests.framework" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.rse.services" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.services.files.ftp" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.ftp" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.0" match="compatible"/>
+      <import plugin="org.eclipse.rse.subsystems.files.ftp" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.help"/>
       <!-- org.junit either comes with the JDT feature (org.eclipse.jdt),  -->
diff --git a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
index a6cae468d44..ae84290391d 100644
--- a/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.tests;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.tests.RSETestsPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,15 +10,15 @@ Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
- org.eclipse.rse.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.shells.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.shells.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rse.tests.framework;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.views,
  org.eclipse.rse.services;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.services.files.ftp;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.rse.subsystems.files.ftp;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.rse.services.files.ftp;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.subsystems.files.ftp;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.filesystem,
  org.eclipse.rse.files.ui
 Eclipse-LazyStart: true
diff --git a/terminal/org.eclipse.tm.terminal-feature/feature.xml b/terminal/org.eclipse.tm.terminal-feature/feature.xml
index dec05659730..ac9665e243f 100644
--- a/terminal/org.eclipse.tm.terminal-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,8 +18,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
index f122d15c8bd..821535038ec 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -19,8 +19,8 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <includes
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml b/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
index d91423c7155..5721c2a5e61 100644
--- a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.serial"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,17 +18,17 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
       <!-- TODO reference the RXTX discovery site once it exists
-      <discovery label="%tmRXTXSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <discovery label="%tmRXTXSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
       -->
    </url>
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
index f83d704b5f5..17fc5b342c4 100644
--- a/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.serial;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Localization: plugin
 Import-Package: gnu.io;resolution:=optional
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Eclipse-BuddyPolicy: ext
 Bundle-Vendor: %providerName
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
index 90a394fbef0..3f9b7fcc99e 100644
--- a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.ssh"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,14 +18,14 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.jsch.core" version="1.0.0" match="compatible"/>
       <import plugin="com.jcraft.jsch" version="0.1.31" match="compatible"/>
    </requires>
diff --git a/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
index dfbba0111b1..f0866ccd9ad 100644
--- a/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.ssh;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)",
  com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)",
  org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/terminal/org.eclipse.tm.terminal.telnet-feature/feature.xml b/terminal/org.eclipse.tm.terminal.telnet-feature/feature.xml
index d024b7475b4..a4c2cc10225 100644
--- a/terminal/org.eclipse.tm.terminal.telnet-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.telnet-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.telnet"
       label="%featureName"
-      version="1.0.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,14 +18,14 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/terminal/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
index 5c0abcac7f8..a238149552e 100644
--- a/terminal/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.telnet;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true
 Eclipse-LazyStart: true
diff --git a/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
index 7bc202145c3..b2477fa7a62 100644
--- a/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.junit,
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
index 3a7af44dfeb..b1af9864b67 100644
--- a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.tm.terminal.view"
       label="%featureName"
-      version="1.0.1.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName">
 
    <description>
@@ -18,14 +18,14 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/2.0"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.0"/>
    </url>
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.tm.terminal" version="2.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
index 6ac93261e5b..4b75cbb3b24 100644
--- a/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.view;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.tm.terminal;bundle-version="[2.0.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-Vendor: %providerName
diff --git a/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
index 84675d5ce46..6eafbb8fb28 100644
--- a/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal; singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin