--- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -37,7 +37,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.core.expressions;bundle-version="3.4.101",
  org.eclipse.ui.forms;bundle-version="3.4.1",
  org.eclipse.jface.text,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.apache.maven.archetype.catalog,
+ org.apache.maven.archetype.descriptor
 Import-Package: org.eclipse.compare.rangedifferencer,
  org.eclipse.ltk.core.refactoring,
  org.slf4j;version="1.6.2"
--- org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -14,9 +14,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.10.0",
  org.eclipse.m2e.workspace.cli;bundle-version="0.1.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.core.resources;bundle-version="3.9.0",
- com.google.guava;bundle-version="[21.0,22.0)"
+ org.apache.maven.archetype.catalog,
+ org.apache.maven.archetype.descriptor,
+ com.google.guava
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.m2e.core,
  org.eclipse.m2e.core.archetype;x-friends:="org.eclipse.m2e.core.ui",
--- org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.ide,
  org.eclipse.core.filesystem,
  org.eclipse.ui.forms,
- com.google.guava;bundle-version="[21.0,22.0)"
+ com.google.guava
 Export-Package: org.eclipse.m2e.editor.xml;x-internal:=true,
  org.eclipse.m2e.editor.xml.internal;x-internal:=true,
  org.eclipse.m2e.editor.xml.internal.lifecycle;x-internal:=true,
--- org.eclipse.m2e.launching/META-INF/MANIFEST.MF
+++ org.eclipse.m2e.launching/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
  org.eclipse.m2e.workspace.cli;bundle-version="0.1.0",
- com.google.guava;bundle-version="[21.0,22.0)"
+ com.google.guava
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor