diff --git a/common/features/org.jboss.tools.common.mylyn.feature/feature.xml b/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
index e962a65..bbcc338 100644
--- a/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
+++ b/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
@@ -5,23 +5,22 @@
 	<copyright>%copyright</copyright>
 	<license>%license</license>
 
+	<!-- 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.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_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.5" match="greaterOrEqual" />
+		<import feature="org.eclipse.mylyn.wikitext_feature" version="1.5.2" match="greaterOrEqual" />
 
-		<import feature="org.eclipse.mylyn.versions" version="0.8.2" match="greaterOrEqual" />
-	</requires>
-			
-	<!-- JBDS-2098 add required mylyn and atlassian plugins/features; not sure if we need subclipse, bamboo, crucible, or fisheye support -->
-	<!--
 	<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" />
@@ -30,7 +29,6 @@
 	<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" />
@@ -77,13 +75,14 @@
 	<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.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="3.0.0" match="greaterOrEqual" unpack="false" />
-	<plugin id="javax.servlet.jsp" version="2.2.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/common/features/org.jboss.tools.common.mylyn.feature/pom.xml b/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
index bf636be..12a35f8 100644
--- a/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
+++ b/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
@@ -28,39 +28,7 @@
 				</executions>
 				<configuration>
 					<excludes>
-						<plugin id="com.thoughtworks.xstream"/>
-						<plugin id="org.apache.axis"/>
-						<plugin id="org.apache.commons.logging"/>
-						<plugin id="org.apache.commons.io"/>
-						<plugin id="org.apache.commons.httpclient"/>
-						<plugin id="org.apache.commons.lang"/>
-						<plugin id="org.apache.commons.codec"/>
-						<plugin id="org.jdom_jaxen"/>
-						<plugin id="org.mortbay.jetty.server"/>
-						<plugin id="org.mortbay.jetty.util"/>
-						<plugin id="org.apache.jasper"/>
-						<plugin id="org.joda.time"/>
-						<plugin id="javax.servlet"/>
-						<plugin id="javax.servlet.jsp"/>
-						<plugin id="javax.xml.rpc"/>
-						<plugin id="javax.el"/>
-						<plugin id="org.eclipse.mylyn.tasks.ui"/>
-						<plugin id="org.eclipse.mylyn.tasks.core"/>
-						<plugin id="org.eclipse.mylyn.tasks.bugs"/>
-						<plugin id="com.atlassian.connector.commons"/>
-						<plugin id="com.atlassian.connector.eclipse.branding.ui"/>
-						<plugin id="com.atlassian.connector.eclipse.commons.core"/>
-						<plugin id="com.atlassian.connector.eclipse.commons.ui"/>
-						<plugin id="com.atlassian.connector.eclipse.core"/>
-						<plugin id="com.atlassian.connector.eclipse.cvs.core"/>
-						<plugin id="com.atlassian.connector.eclipse.cvs.ui"/>
-						<plugin id="com.atlassian.connector.eclipse.directclickthrough.ui"/>
-						<plugin id="com.atlassian.connector.eclipse.help"/>
-						<plugin id="com.atlassian.connector.eclipse.jira.core"/>
-						<plugin id="com.atlassian.connector.eclipse.jira.ui"/>
-						<plugin id="com.atlassian.connector.eclipse.monitor.core"/>
-						<plugin id="com.atlassian.connector.eclipse.monitor.ui"/>
-						<plugin id="com.atlassian.connector.eclipse.ui"/>
+						<!-- <plugin id="sourceplugin.nosource"/> -->
 	                	<!-- <feature id="sourcefeature.feature.nosource"/> -->
     				</excludes>
                 </configuration>