diff --git a/org.eclipse.tm.terminal.local-feature/build.properties b/org.eclipse.tm.terminal.local-feature/build.properties
index 15b11eccda6..5336e1f0eda 100644
--- a/org.eclipse.tm.terminal.local-feature/build.properties
+++ b/org.eclipse.tm.terminal.local-feature/build.properties
@@ -15,4 +15,3 @@ bin.includes = feature.xml,\
                epl-v10.html,\
                license.html,\
                eclipse_update_120.jpg
-generate.plugin@org.eclipse.tm.terminal.local.source=org.eclipse.tm.terminal.local
diff --git a/org.eclipse.tm.terminal.local-feature/feature.properties b/org.eclipse.tm.terminal.local-feature/feature.properties
index 5f1425a6fe6..6dcc6dd75fa 100644
--- a/org.eclipse.tm.terminal.local-feature/feature.properties
+++ b/org.eclipse.tm.terminal.local-feature/feature.properties
@@ -26,7 +26,7 @@ tmUpdateSiteName=Target Management 3.2 Updates
 
 # "description" property - description of the feature
 description=A terminal emulation for local shells and external tools.\n\
-Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac. Includes Source.
+Requires CDT Core 7.0 or later. Works on Linux, Solaris and Mac.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/org.eclipse.tm.terminal.local-feature/feature.xml b/org.eclipse.tm.terminal.local-feature/feature.xml
index 520aec75c08..ef0813f32fa 100644
--- a/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -34,16 +34,14 @@
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/dsdp/tm/updates/3.2"/>
    </url>
 
-   <includes
-         id="org.eclipse.tm.terminal"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.cdt.core" version="5.2.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.tm.terminal" version="3.0.0" match="equivalent"/>
+      <import plugin="org.eclipse.tm.terminal.view" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.externaltools"/>
    </requires>
@@ -55,11 +53,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.tm.terminal.local.source"
-         download-size="25"
-         install-size="43"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/org.eclipse.tm.terminal.local.sdk-feature/.project b/org.eclipse.tm.terminal.local.sdk-feature/.project
new file mode 100644
index 00000000000..150da9a0fdd
--- /dev/null
+++ b/org.eclipse.tm.terminal.local.sdk-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.tm.terminal.local.sdk-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
index 058ba465e64..b192be99f47 100644
--- a/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.local/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.local.LocalTerminalActivator
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.tm.terminal;bundle-version="2.0.0",
+Require-Bundle: org.eclipse.tm.terminal;bundle-version="[3.0.0,3.1.0)",
  org.eclipse.cdt.core;bundle-version="5.2.0",
  org.eclipse.core.runtime,
  org.eclipse.debug.core,