diff --git a/extras/features/com.jboss.jbds.mylyn.feature/feature.xml b/extras/features/com.jboss.jbds.mylyn.feature/feature.xml
index 1425789..58cc7d3 100644
--- a/extras/features/com.jboss.jbds.mylyn.feature/feature.xml
+++ b/extras/features/com.jboss.jbds.mylyn.feature/feature.xml
@@ -28,7 +28,6 @@ Raleigh NC 27606 USA.
    <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" />
@@ -42,74 +41,15 @@ Raleigh NC 27606 USA.
 		<import feature="org.eclipse.mylyn.versions" version="0.8.2" match="greaterOrEqual" />
 	</requires>
 
-	<!-- JBDS-1682 Atlassian JIRA support :: Rather than nesting features, include plugins directly so we can override hard-coded version reqs on upstream deps -->
-	<!-- no longer exists in Mylyn 3.6.2 <plugin id="org.eclipse.mylyn.jira.ui" version="3.4.0" match="greaterOrEqual" unpack="false" />
-	<plugin id="org.eclipse.mylyn.jira.core" version="3.4.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" />
+	<!-- 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.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.crucible.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
 	<plugin id="com.atlassian.connector.eclipse.crucible.ui" 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.fisheye.core" version="0.0.0" match="greaterOrEqual" unpack="false" />
 	<plugin id="com.atlassian.connector.eclipse.fisheye.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.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" />
-	<!-- Subversive not included, only Subclipse
-	<plugin id="com.atlassian.connector.eclipse.subversive.core" version="3.0.0" match="greaterOrEqual" unpack="false" />
-	<plugin id="com.atlassian.connector.eclipse.subversive.ui" version="3.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.23" match="greaterOrEqual" unpack="false" />
-	<plugin id="org.mortbay.jetty.util" version="6.1.23" 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="3.0.0" match="greaterOrEqual" unpack="false" />
-	<plugin id="javax.servlet.jsp" version="2.2.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" />
-
 </feature>
diff --git a/extras/site/site.xml b/extras/site/site.xml
index 53d19f8..1263e41 100644
--- a/extras/site/site.xml
+++ b/extras/site/site.xml
@@ -81,6 +81,9 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 	</feature>
 	<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 e77bc6c..aec4812 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -335,6 +335,25 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
             groupId="org.jboss.tools.central.discovery.testing.local"
+            description="Mylyn support for reporting JBoss JIRAs and Red Hat Bugzillas"
+            id="org.jboss.tools.common.mylyn.feature"
+            kind="task"
+            license="Free, EPL"
+            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">
+         </icon>
+         <overview
+               url="http://www.jboss.org/tools">
+         </overview>
+      </connectorDescriptor>
+      <connectorDescriptor
+            categoryId="org.jboss.tools.central.discovery.testing"
+            groupId="org.jboss.tools.central.discovery.testing.local"
             description="Tool support for PMD"
             id="net.sourceforge.pmd.eclipse"
             kind="task"