diff --git a/extras/features/com.jboss.jbds.mylyn.feature/feature.xml b/extras/features/com.jboss.jbds.mylyn.feature/feature.xml
index 58cc7d3..af4e882 100644
--- a/extras/features/com.jboss.jbds.mylyn.feature/feature.xml
+++ b/extras/features/com.jboss.jbds.mylyn.feature/feature.xml
@@ -25,25 +25,22 @@ source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
 Raleigh NC 27606 USA.
    </license>
 
-	<requires>
-		<import feature="org.eclipse.mylyn_feature" version="3.6.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.ide_feature" version="3.6.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.commons" version="3.6.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.context_feature" version="3.6.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.bugzilla_feature" version="3.6.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.java_feature" version="3.6.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.pde_feature" version="3.6.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.team_feature" version="3.6.2" match="greaterOrEqual" />
-
-		<import feature="org.eclipse.mylyn.wikitext_feature" version="1.5.2" match="greaterOrEqual" />
+	<!-- JBDS-2098 add defaults for issues.jboss.org and bugzilla.redhat.com -->
+	<plugin id="org.jboss.tools.common.mylyn" download-size="0" install-size="0" version="0.0.0" />
 
+	<requires>
+		<import feature="org.eclipse.mylyn_feature" version="3.6.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.ide_feature" version="3.6.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.commons" version="3.6.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.context_feature" version="3.6.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.bugzilla_feature" version="3.6.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.java_feature" version="3.6.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.pde_feature" version="3.6.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.team_feature" version="3.6.5" match="greaterOrEqual" />
 		<import feature="org.eclipse.mylyn.cvs" version="0.8.2" match="greaterOrEqual" />
-		<import feature="org.eclipse.mylyn.versions" version="0.8.2" match="greaterOrEqual" />
-	</requires>
+		<import feature="org.eclipse.mylyn.versions" version="0.8.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.wikitext_feature" version="1.5.2" match="greaterOrEqual" />
 
-	<!-- JBDS-2098 add defaults for issues.jboss.org and bugzilla.redhat.com -->
-	<includes id="org.jboss.tools.common.mylyn.feature" version="0.0.0" />
-	<!-- JBDS-2098 not sure if we need subclipse, bamboo, crucible, or fisheye support in JBT -->
 	<plugin id="com.atlassian.connector.eclipse.bamboo.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
 	<plugin id="com.atlassian.connector.eclipse.bamboo.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
 	<plugin id="com.atlassian.connector.eclipse.crucible.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
@@ -52,4 +49,60 @@ Raleigh NC 27606 USA.
 	<plugin id="com.atlassian.connector.eclipse.fisheye.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
 	<plugin id="com.atlassian.connector.eclipse.subclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
 	<plugin id="com.atlassian.connector.eclipse.subclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+
+		<plugin id="org.eclipse.mylyn.tasks.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.mylyn.tasks.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.mylyn.tasks.bugs" version="0.0.0" match="greaterOrEqual" unpack="false" />
+
+		<plugin id="com.atlassian.connector.commons" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.branding.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.commons.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.commons.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.cvs.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.cvs.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.directclickthrough.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.help" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.jira.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.jira.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.monitor.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.monitor.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="com.atlassian.connector.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+
+		<!-- JBDS-1682 dependent 3rd party plugins needed to install Atlassian JIRA support -->
+		<plugin id="com.thoughtworks.xstream" version="1.3.0" match="greaterOrEqual" unpack="false" />
+
+		<plugin id="org.eclipse.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.ui.ide" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.ui.workbench.texteditor" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.osgi" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.core.filesystem" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.ui.editors" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.team.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.team.ui" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.jface" version="0.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.eclipse.compare" version="0.0.0" match="greaterOrEqual" unpack="false" />
+
+		<plugin id="org.apache.axis" version="1.4.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.apache.commons.logging" version="1.1.1" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.apache.commons.io" version="2.0.1" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.apache.commons.httpclient" version="3.1.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.apache.commons.lang" version="2.4.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.apache.commons.codec" version="1.3.0" match="greaterOrEqual" unpack="false" />
+
+		<plugin id="org.jdom_jaxen" version="1.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.mortbay.jetty.server" version="6.1.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.mortbay.jetty.util" version="6.1.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.apache.jasper" version="5.5.17" match="greaterOrEqual" unpack="false" />
+		<plugin id="org.joda.time" version="1.6.0" match="greaterOrEqual" unpack="false" />
+
+		<plugin id="javax.servlet" version="2.5.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="javax.servlet.jsp" version="2.0.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="javax.xml.rpc" version="1.1.0" match="greaterOrEqual" unpack="false" />
+		<plugin id="javax.el" version="2.2.0" match="greaterOrEqual" unpack="false" />
+	</requires>
 </feature>
diff --git a/extras/site/site.xml b/extras/site/site.xml
index 1263e41..86b0c3d 100644
--- a/extras/site/site.xml
+++ b/extras/site/site.xml
@@ -82,8 +82,6 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	<feature url="features/org.eclipse.mylyn.wikitext_feature_0.0.0.jar" id="org.eclipse.mylyn.wikitext_feature" version="0.0.0">
 	</feature>
 	<!-- JBDS-2098 add defaults for issues.jboss.org and bugzilla.redhat.com -->
-	<feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
-	</feature>
 	<feature url="features/com.jboss.jbds.mylyn.feature_0.0.0.jar" id="com.jboss.jbds.mylyn.feature" version="0.0.0">
 		<category name="JBoss Selected Features" />
 	</feature>
diff --git a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
index ac88ae8..82b24c1 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -342,7 +342,6 @@
             name="Mylyn Issue Tracker Connectors"
             provider="JBoss by Red Hat"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
-         <iu id="org.jboss.tools.common.mylyn.feature"/>
          <iu id="com.jboss.jbds.mylyn.feature"/>
          <icon
                image32="images/jbds_icon32.png">