diff --git a/product/features/com.jboss.jbds.m2e.feature/feature.xml b/product/features/com.jboss.jbds.m2e.feature/feature.xml
index 82d35c2..a79dfc4 100644
--- a/product/features/com.jboss.jbds.m2e.feature/feature.xml
+++ b/product/features/com.jboss.jbds.m2e.feature/feature.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="com.jboss.jbds.m2e.feature"
-      label="Maven Integration (Selected)"
- version="1.1.0.qualifier"
- provider-name="JBoss by Red Hat">
+<feature id="com.jboss.jbds.m2e.feature" label="Maven Integration (Selected)" version="1.1.0.qualifier" provider-name="JBoss by Red Hat">
 
-   <description>
-Contains m2e 1.0.100, m2e-wtp 0.15.1 and mavenarchiver 0.15, including support for CDI, JPA, Hibernate, JSF, Portlet, Seam, JAX-RS, Project Examples and Maven Profiles Management (Selected). 
-Features selected by Red Hat for use with JBoss Developer Studio. 
-   </description>
+	<description>Contains m2e 1.0.100, m2e-wtp 0.15.1 and mavenarchiver 0.15, including support for CDI, JPA, Hibernate, JSF, Portlet, Seam, JAX-RS, Project Examples and Maven Profiles Management (Selected). 
+Features selected by Red Hat for use with JBoss Developer Studio.</description>
 
-   <copyright>%copyright
-   </copyright>
+	<copyright>%copyright</copyright>
 
    <license url="license.html">Red Hat, Inc. licenses these features and plugins to you under
 certain open source licenses (or aggregations of such licenses),
@@ -23,7 +16,20 @@ Raleigh NC 27606 USA.
    </license>
    
    <requires>
-	<import feature="org.eclipse.m2e.feature" version="1.0.100" match="greaterOrEqual"/>
+		<!-- JBDS-2054 :: remove org.eclipse.m2e.usagedata from JBDS; include requirements instead
+		<import feature="org.eclipse.m2e.feature" version="1.0.100" match="greaterOrEqual"/> -->
+		<import plugin="org.eclipse.emf.ecore" />
+		<import plugin="org.eclipse.emf.ecore.xmi" />
+		<import plugin="org.eclipse.emf.edit" />
+		<import plugin="org.eclipse.emf.ecore.edit" />
+		<import plugin="org.eclipse.wst.common.emf" />
+		<import plugin="org.eclipse.wst.sse.core" />
+		<import plugin="org.eclipse.wst.xml.core" />
+		<import plugin="org.eclipse.jem.util" />
+		<import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual" />
+		<import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual" />
+		<import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual" />
+
 	<import feature="org.maven.ide.eclipse.wtp.feature" version="0.15.1" match="greaterOrEqual"/>
 	<import feature="org.sonatype.m2e.mavenarchiver.feature" version="0.15.0" match="greaterOrEqual"/>
 
@@ -41,6 +47,22 @@ Raleigh NC 27606 USA.
         <!-- JBDS-1938 not ready for JBDS yet <import feature="org.jboss.tools.maven.jbosspackaging.feature" version="1.3.0" match="compatible" /> -->
    </requires>
 
+	<!-- JBDS-2054 :: remove org.eclipse.m2e.usagedata from JBDS; include other plugins from org.eclipse.m2e.feature -->
+	<plugin id="org.eclipse.m2e.archetype.common" download-size="0" install-size="0" version="1.0.100" />
+	<plugin id="org.eclipse.m2e.maven.indexer" download-size="0" install-size="0" version="1.0.100" />
+	<plugin id="org.eclipse.m2e.model.edit" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.core" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.launching" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.jdt" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.editor" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.editor.xml" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.maven.runtime" download-size="0" install-size="0" version="1.0.100" />
+	<plugin id="org.eclipse.m2e.refactoring" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.lifecyclemapping.defaults" download-size="0" install-size="0" version="1.0.100" />
+	<plugin id="org.eclipse.m2e.discovery" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.core.ui" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+	<plugin id="org.eclipse.m2e.scm" download-size="0" install-size="0" version="1.0.100" unpack="false" />
+
 	<!-- dependent 3rd party plugins needed to install m2e -->
 	<plugin id="ch.qos.logback.classic" version="0.9.27" match="greaterOrEqual" download-size="0" install-size="0"/>
 	<plugin id="ch.qos.logback.core" version="0.9.27" match="greaterOrEqual" download-size="0" install-size="0"/>