diff --git a/extras/site/associate.properties b/extras/site/associate.properties
index 778422c..efbff10 100644
--- a/extras/site/associate.properties
+++ b/extras/site/associate.properties
@@ -1,2 +1,2 @@
 # associate sites to add to the resulting repo 
-associate.sites=https://devstudio.jboss.com/updates/5.0/
+associate.sites=https://devstudio.jboss.com/updates/6.0/
diff --git a/product/features/com.jboss.jbds.m2e.feature/feature.xml b/product/features/com.jboss.jbds.m2e.feature/feature.xml
index d74619a..d742f2f 100644
--- a/product/features/com.jboss.jbds.m2e.feature/feature.xml
+++ b/product/features/com.jboss.jbds.m2e.feature/feature.xml
@@ -19,11 +19,11 @@ Raleigh NC 27606 USA.
    </license>
    
    <requires>
-		<!-- JBDS-2054 :: remove org.eclipse.m2e.usagedata from JBDS; include requirements instead
-		<import feature="org.eclipse.m2e.feature" version="0.0.0" match="greaterOrEqual"/> -->
-		<!-- JBIDE-12294 OLD IU <import feature="org.maven.ide.eclipse.wtp.feature" version="0.15.2" match="compatible" /> -->
-		<import feature="org.eclipse.m2e.wtp.feature" version="0.16.0" match="greaterOrEqual" />
-		<import feature="org.sonatype.m2e.mavenarchiver.feature" version="0.15.0" match="greaterOrEqual" />
+		<!-- New for 6.x: include org.eclipse.m2e.wtp.feature w/o set version so that we get the latest from the Target Platform -->
+		<!-- JBDS-2253: m2e.wtp requires m2e and m2e.mavenarchiver so keep things simple, just include m2e.wtp
+		<import feature="org.eclipse.m2e.feature" version="1.2.0" match="greaterOrEqual"/>
+		<import feature="org.sonatype.m2e.mavenarchiver.feature" version="0.15.0" match="greaterOrEqual" /> -->
+		<import feature="org.eclipse.m2e.wtp.feature" />
 
 		<import plugin="org.eclipse.emf.ecore" />
 		<import plugin="org.eclipse.emf.ecore.xmi" />
@@ -38,47 +38,25 @@ Raleigh NC 27606 USA.
 		<import feature="org.eclipse.jdt" />
 
 		<!-- New for 5.x: JBoss Tools Maven Integration plugins-->
-		<import feature="org.jboss.tools.maven.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.apt.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.cdi.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.hibernate.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.jaxrs.feature" version="0.0.0" match="compatible" />
-		<!-- JBDS-1938 not ready for JBDS yet <import feature="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0" match="compatible" /> -->
-		<import feature="org.jboss.tools.maven.jdt.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.jpa.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.jsf.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.portlet.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.profiles.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.project.examples.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.seam.feature" version="0.0.0" match="compatible" />
-		<import feature="org.jboss.tools.maven.sourcelookup.feature" version="0.0.0" match="compatible" />
+		<import feature="org.jboss.tools.maven.feature"/>
+		<import feature="org.jboss.tools.maven.apt.feature"/>
+		<import feature="org.jboss.tools.maven.cdi.feature"/>
+		<import feature="org.jboss.tools.maven.hibernate.feature"/>
+		<import feature="org.jboss.tools.maven.jaxrs.feature"/>
+		<!-- JBDS-1938 not ready for JBDS yet <import feature="org.jboss.tools.maven.jbosspackaging.feature"/> -->
+		<import feature="org.jboss.tools.maven.jdt.feature"/>
+		<import feature="org.jboss.tools.maven.jpa.feature"/>
+		<import feature="org.jboss.tools.maven.jsf.feature"/>
+		<import feature="org.jboss.tools.maven.portlet.feature"/>
+		<import feature="org.jboss.tools.maven.profiles.feature"/>
+		<import feature="org.jboss.tools.maven.project.examples.feature"/>
+		<import feature="org.jboss.tools.maven.seam.feature"/>
+		<import feature="org.jboss.tools.maven.sourcelookup.feature"/>
    </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="0.0.0"/>
-	<plugin id="org.eclipse.m2e.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.core.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.discovery" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.editor" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.editor.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>	
-	<plugin id="org.eclipse.m2e.jdt" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.launching" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.lifecyclemapping.defaults" download-size="0" install-size="0" version="0.0.0"/>
-	<plugin id="org.eclipse.m2e.maven.indexer" download-size="0" install-size="0" version="0.0.0"/>
-	<plugin id="org.eclipse.m2e.maven.runtime" download-size="0" install-size="0" version="0.0.0"/>
-	<plugin id="org.eclipse.m2e.model.edit" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.refactoring" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-	<plugin id="org.eclipse.m2e.scm" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
-	<!-- dependent 3rd party plugins needed to install m2e -->
+	<!-- JBDS-2253: most previously required plugins are included in m2e.wtp/m2e's dep chain, so no longer need to list explicitly
+	     But these three ch.qos ones are not installed when installing m2e.wtp - still needed? comment out and see what breaks
 	<plugin id="ch.qos.logback.classic" version="0.0.0" download-size="0" install-size="0"/>
 	<plugin id="ch.qos.logback.core" version="0.0.0" download-size="0" install-size="0"/>
-	<plugin id="ch.qos.logback.slf4j" version="0.0.0" download-size="0" install-size="0"/>
-	<plugin id="org.slf4j.api" version="0.0.0" download-size="0" install-size="0"/>
-	<plugin id="com.ning.async-http-client" version="0.0.0" download-size="0" install-size="0"/>
-	<plugin id="org.jboss.netty" version="0.0.0" download-size="0" install-size="0"/>
-	<plugin id="org.eclipse.equinox.p2.discovery.compatibility" version="0.0.0" download-size="0" install-size="0"/>
-	<plugin id="org.eclipse.equinox.p2.discovery" version="0.0.0" download-size="0" install-size="0"/>
-	<plugin id="org.eclipse.equinox.p2.ui.discovery" version="0.0.0" download-size="0" install-size="0"/>
-	<!-- JBDS-2071 remove this unneeded plugin <plugin id="org.hamcrest.core" version="0.0.0" download-size="0" install-size="0" /> -->
+	<plugin id="ch.qos.logback.slf4j" version="0.0.0" download-size="0" install-size="0"/> -->
 </feature>
diff --git a/product/features/com.jboss.jbds.product.feature/feature.xml b/product/features/com.jboss.jbds.product.feature/feature.xml
index b1e11d1..bdf62ec 100644
--- a/product/features/com.jboss.jbds.product.feature/feature.xml
+++ b/product/features/com.jboss.jbds.product.feature/feature.xml
@@ -168,8 +168,7 @@
       <import feature="org.eclipse.platform"/>
    </requires>
 
-   <!-- TODO: why are we BOTH including the org.eclipse.platform plugin and requiring the org.eclipse.platform feature? -->
-   <includes id="org.eclipse.platform" version="4.2.1"/>
+   <!-- JBDS-2253: no need to both import AND include org.eclipse.platform feature -->
 
    <plugin
          id="com.jboss.jbds.product"