diff --git a/org.eclipse.tm.terminal-feature/feature.xml b/org.eclipse.tm.terminal-feature/feature.xml
index ecc1431033d..ebaa4c3d445 100644
--- a/org.eclipse.tm.terminal-feature/feature.xml
+++ b/org.eclipse.tm.terminal-feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="org.eclipse.tm.terminal"
       label="%featureName"
-      provider-name="%providerName"
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
 
    <description>
       %description
@@ -25,7 +25,6 @@
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jface.text"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.serial-feature/feature.xml b/org.eclipse.tm.terminal.serial-feature/feature.xml
index 1f813bb0721..769fd36325b 100644
--- a/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/org.eclipse.tm.terminal.serial-feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="org.eclipse.tm.terminal.serial"
       label="%featureName"
-      provider-name="%providerName"
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
 
    <description>
       %description
@@ -28,7 +28,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal"/>
+      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
index 3714cde554e..140db3e7a73 100644
--- a/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.serial/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Localization: plugin
 Import-Package: gnu.io;resolution:=optional
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal
+ org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Eclipse-BuddyPolicy: ext
 Bundle-Vendor: %providerName
diff --git a/org.eclipse.tm.terminal.ssh-feature/feature.xml b/org.eclipse.tm.terminal.ssh-feature/feature.xml
index 52528a0dabb..9ed0bce9f7b 100644
--- a/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/org.eclipse.tm.terminal.ssh-feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="org.eclipse.tm.terminal.ssh"
       label="%featureName"
-      provider-name="%providerName"
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
 
    <description>
       %description
@@ -25,9 +25,9 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal"/>
       <import plugin="com.jcraft.jsch" version="0.1.28" match="compatible"/>
-      <import plugin="org.eclipse.jsch.core"/>
+      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.jsch.core" version="1.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
index e55c1bba157..997ecba051b 100644
--- a/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal,
+ org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)",
  com.jcraft.jsch;bundle-version="[0.1.28,1.0.0)",
- org.eclipse.jsch.core
+ org.eclipse.jsch.core;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.tm.internal.terminal.ssh;x-internal:=true
 Bundle-Activator: org.eclipse.tm.internal.terminal.ssh.Activator
diff --git a/org.eclipse.tm.terminal.telnet-feature/feature.xml b/org.eclipse.tm.terminal.telnet-feature/feature.xml
index 81786ff3262..903d549837f 100644
--- a/org.eclipse.tm.terminal.telnet-feature/feature.xml
+++ b/org.eclipse.tm.terminal.telnet-feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="org.eclipse.tm.terminal.telnet"
       label="%featureName"
-      provider-name="%providerName"
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
 
    <description>
       %description
@@ -25,7 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal"/>
+      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
index e6e1e91d535..5c0abcac7f8 100644
--- a/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal
+ org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true
 Eclipse-LazyStart: true
diff --git a/org.eclipse.tm.terminal.view-feature/feature.xml b/org.eclipse.tm.terminal.view-feature/feature.xml
index afaeae5074d..af56ab46a74 100644
--- a/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
       id="org.eclipse.tm.terminal.view"
       label="%featureName"
-      provider-name="%providerName"
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
 
    <description>
       %description
@@ -25,7 +25,7 @@
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.tm.terminal"/>
+      <import plugin="org.eclipse.tm.terminal" version="1.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
index fe5a0567f78..15a4f49a770 100644
--- a/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ 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
+ org.eclipse.tm.terminal;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Bundle-Vendor: %providerName