diff --git a/product/features/com.jboss.jbds.product.feature/feature.xml b/product/features/com.jboss.jbds.product.feature/feature.xml
index 7d2598d..d1e32bf 100644
--- a/product/features/com.jboss.jbds.product.feature/feature.xml
+++ b/product/features/com.jboss.jbds.product.feature/feature.xml
@@ -86,6 +86,7 @@
 		<import feature="org.jboss.tools.openshift.express.feature" />
 		<import feature="org.jboss.tools.openshift.egit.integration.feature" />
 		<import feature="org.jboss.tools.ws.jaxrs.feature" />
+		<import feature="org.jboss.tools.common.jdt.feature"/>
 	</requires>
 
 	<includes id="org.eclipse.platform" version="0.0.0" />
diff --git a/product/features/com.jboss.jbds/com.jboss.jbds.product b/product/features/com.jboss.jbds/com.jboss.jbds.product
index 5137d42..b46ff83 100644
--- a/product/features/com.jboss.jbds/com.jboss.jbds.product
+++ b/product/features/com.jboss.jbds/com.jboss.jbds.product
@@ -108,6 +108,7 @@ JBoss by Red Hat - Initial implementation.
       <feature id="org.jboss.tools.openshift.express.feature"/>
       <feature id="org.jboss.tools.openshift.egit.integration.feature"/>
       <feature id="org.jboss.tools.ws.jaxrs.feature"/>
+      <feature id="org.jboss.tools.common.jdt.feature"/>
    </features>
 
 </product>
diff --git a/product/site/site.xml b/product/site/site.xml
index 6662181..8e694fb 100644
--- a/product/site/site.xml
+++ b/product/site/site.xml
@@ -177,25 +177,27 @@
 		<category name="AbridgedTools" />
 		<category name="MavenTools" />
 	</feature>
-	<!-- ONLY on JBDS Extras for now
+	<!-- ONLY in JBT and JBDS Extras
 	<feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0">
 		<category name="MavenTools" />
 	</feature>
 	-->
 	
-	<!-- only on JBT
+	<!-- only in JBT
 	<feature url="features/org.jboss.tools.gwt.feature_0.0.0.jar" id="org.jboss.tools.gwt.feature" version="0.0.0">
 		<category name="GeneralTools" />
 	</feature>
-	<feature url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
 		<category name="AbridgedTools" />
                 <category name="GeneralTools"/>
 	</feature>
-	<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 url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
 		<category name="AbridgedTools" />
 		<category name="GeneralTools"/>
 	</feature>
-	-->
+
 	<!-- include but do not categorize -->
 	<feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0">
 	</feature>
diff --git a/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product b/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product
index 5137d42..b46ff83 100644
--- a/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product
+++ b/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product
@@ -108,6 +108,7 @@ JBoss by Red Hat - Initial implementation.
       <feature id="org.jboss.tools.openshift.express.feature"/>
       <feature id="org.jboss.tools.openshift.egit.integration.feature"/>
       <feature id="org.jboss.tools.ws.jaxrs.feature"/>
+      <feature id="org.jboss.tools.common.jdt.feature"/>
    </features>
 
 </product>