diff --git a/product/features/com.jboss.jbds.product.feature/feature.xml b/product/features/com.jboss.jbds.product.feature/feature.xml
index 19f16cc..acb6b79 100644
--- a/product/features/com.jboss.jbds.product.feature/feature.xml
+++ b/product/features/com.jboss.jbds.product.feature/feature.xml
@@ -86,8 +86,11 @@
       <import feature="org.jboss.tools.runtime.seam.detector.feature"/>
       <import feature="org.jboss.tools.runtime.as.detector.feature"/>
       <import feature="org.jboss.tools.central.feature"/>
+      <import feature="org.jboss.tools.forge.feature"/>
    </requires>
 
+   <includes id="com.jboss.jbds.m2e.feature" version="0.0.0"/>
+
    <plugin
          id="com.jboss.jbds.product"
          download-size="0"
diff --git a/product/features/com.jboss.jbds/com.jboss.jbds.product b/product/features/com.jboss.jbds/com.jboss.jbds.product
index 70b11bb..fa73798 100644
--- a/product/features/com.jboss.jbds/com.jboss.jbds.product
+++ b/product/features/com.jboss.jbds/com.jboss.jbds.product
@@ -103,6 +103,7 @@ JBoss by Red Hat - Initial implementation.
       <feature id="org.jboss.tools.ws.feature"/>
       <feature id="org.jboss.tools.portlet.feature"/>
       <feature id="org.jboss.tools.central.feature"/>
+      <feature id="org.jboss.tools.forge.feature"/>
    </features>
 
 </product>
diff --git a/product/site/site.xml b/product/site/site.xml
index 3165f74..ad2ce53 100644
--- a/product/site/site.xml
+++ b/product/site/site.xml
@@ -92,11 +92,12 @@
 		<category name="AbridgedTools"/>
 		<category name="GeneralTools"/>
 	</feature>
-
-	<!-- only in JBT 
 	<feature url="features/org.jboss.tools.forge.feature_0.0.0.jar" id="org.jboss.tools.forge.feature" version="0.0.0">
+		<category name="AbridgedTools"/>
 		<category name="WebTools" />
 	</feature>
+
+	<!-- only in JBT 
 	<feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0">
 		<category name="AbridgedTools" />
 		<category name="GeneralTools" />
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 70b11bb..fa73798 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
@@ -103,6 +103,7 @@ JBoss by Red Hat - Initial implementation.
       <feature id="org.jboss.tools.ws.feature"/>
       <feature id="org.jboss.tools.portlet.feature"/>
       <feature id="org.jboss.tools.central.feature"/>
+      <feature id="org.jboss.tools.forge.feature"/>
    </features>
 
 </product>