diff --git a/eclipse-m2e-core-archetype-archetypemanager.patch b/eclipse-m2e-core-archetype-archetypemanager.patch
index 5153e04..cfb6ca8 100644
--- a/eclipse-m2e-core-archetype-archetypemanager.patch
+++ b/eclipse-m2e-core-archetype-archetypemanager.patch
@@ -1,24 +1,24 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java.orig	2012-07-19 15:40:38.000000000 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java	2012-07-19 18:07:43.000000000 +0100
-@@ -35,7 +35,6 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java.orig	2014-02-16 17:42:33.535701239 +0000
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/MavenPluginActivator.java	2014-02-16 17:47:37.883953842 +0000
+@@ -40,7 +40,6 @@
+ import org.codehaus.plexus.PlexusContainerException;
  import org.codehaus.plexus.classworlds.ClassWorld;
- import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
  
 -import org.apache.maven.archetype.Archetype;
+ import org.apache.maven.archetype.ArchetypeGenerationRequest;
  import org.apache.maven.archetype.common.ArchetypeArtifactManager;
  import org.apache.maven.archetype.source.ArchetypeDataSource;
- import org.apache.maven.artifact.factory.ArtifactFactory;
-@@ -385,8 +384,8 @@
-     return repositoryRegistry;
-   }
- 
+@@ -406,8 +405,8 @@
+   /**
+    * @deprecated use {@link ArchetypeManager#getArchetyper()}
+    */
 -  public Archetype getArchetype() {
--    return lookup(Archetype.class);
+-    return archetypeManager.getArchetyper();
 +  public org.apache.maven.archetype.ArchetypeManager getArchetype() {
-+    return lookup(org.apache.maven.archetype.ArchetypeManager.class);
++    return maven.lookupComponent(org.apache.maven.archetype.ArchetypeManager.class);
    }
  
-   public ArchetypeDataSource getArchetypeDataSource(String hint) {
+   /**
 --- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java.orig	2012-07-19 15:47:14.000000000 +0100
 +++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeCatalogFactory.java	2012-07-19 16:13:07.000000000 +0100
 @@ -21,7 +21,7 @@
@@ -61,3 +61,32 @@
                archetyper.updateLocalCatalog(archetype);
  
                loadArchetypes(archetypeGroupId, archetypeArtifactId, archetypeVersion);
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java.orig	2014-02-16 18:31:33.962586816 +0000
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/archetype/ArchetypeManager.java	2014-02-16 18:32:47.757137914 +0000
+@@ -65,7 +65,7 @@
+ 
+   final ArchetypeArtifactManager aaMgr;
+ 
+-  private final org.apache.maven.archetype.Archetype archetyper;
++  private final org.apache.maven.archetype.ArchetypeManager archetyper;
+ 
+   private final PlexusContainer container;
+ 
+@@ -75,7 +75,7 @@
+     this.writer = new ArchetypeCatalogsWriter();
+     try {
+       this.aaMgr = container.lookup(ArchetypeArtifactManager.class);
+-      this.archetyper = container.lookup(org.apache.maven.archetype.Archetype.class);
++      this.archetyper = container.lookup(org.apache.maven.archetype.ArchetypeManager.class);
+     } catch(ComponentLookupException ex) {
+       throw new NoSuchComponentException(ex);
+     }
+@@ -246,7 +246,7 @@
+   /**
+    * @since 1.5
+    */
+-  public org.apache.maven.archetype.Archetype getArchetyper() {
++  public org.apache.maven.archetype.ArchetypeManager getArchetyper() {
+     return archetyper;
+   }
+ 
diff --git a/eclipse-m2e-core-fix-m2e.core-manifest.patch b/eclipse-m2e-core-fix-m2e.core-manifest.patch
index 879cf9d..166c5d6 100644
--- a/eclipse-m2e-core-fix-m2e.core-manifest.patch
+++ b/eclipse-m2e-core-fix-m2e.core-manifest.patch
@@ -1,11 +1,11 @@
---- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig	2013-06-28 21:21:12.665005851 +0100
-+++ org.eclipse.m2e.core/META-INF/MANIFEST.MF	2013-06-28 21:41:37.343691243 +0100
-@@ -13,9 +13,10 @@
-  org.eclipse.m2e.archetype.common;bundle-version="[1.4.0,1.5.0)",
-  org.eclipse.m2e.maven.indexer;bundle-version="[1.4.0,1.5.0)",
-  slf4j.api,
-- com.ning.async-http-client;bundle-version="[1.6.5,1.6.6)"
-+ com.ning.async-http-client,
+--- org.eclipse.m2e.core/META-INF/MANIFEST.MF.orig	2014-02-16 19:53:39.063321131 +0000
++++ org.eclipse.m2e.core/META-INF/MANIFEST.MF	2014-02-16 19:56:46.630738257 +0000
+@@ -12,9 +12,10 @@
+  org.eclipse.m2e.maven.runtime;bundle-version="[1.5.0,1.6.0)",
+  org.eclipse.m2e.archetype.common;bundle-version="[1.5.0,1.6.0)",
+  org.eclipse.m2e.maven.indexer;bundle-version="[1.5.0,1.6.0)",
+- slf4j.api
++ slf4j.api,
 + org.apache.maven.archetype.catalog,
 + org.apache.maven.archetype.descriptor
  Bundle-ActivationPolicy: lazy
diff --git a/eclipse-m2e-core-m2e.core-resourcefetcher.patch b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
index bdd3635..69cff79 100644
--- a/eclipse-m2e-core-m2e.core-resourcefetcher.patch
+++ b/eclipse-m2e-core-m2e.core-resourcefetcher.patch
@@ -1,29 +1,37 @@
---- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java.orig	2012-08-04 13:58:38.000000000 +0100
-+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AsyncFetcher.java	2012-08-04 13:54:49.000000000 +0100
-@@ -44,7 +44,7 @@
- import org.codehaus.plexus.util.IOUtil;
- import org.codehaus.plexus.util.io.RawInputStreamFacade;
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java.orig	2014-02-16 18:48:04.738884102 +0000
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java	2014-02-16 18:49:17.567418062 +0000
+@@ -34,14 +34,14 @@
+ import org.eclipse.core.runtime.NullProgressMonitor;
+ import org.eclipse.core.runtime.OperationCanceledException;
  
 -import org.apache.maven.index.updater.AbstractResourceFetcher;
 +import org.apache.maven.index.updater.ResourceFetcher;
  import org.apache.maven.wagon.authentication.AuthenticationInfo;
  import org.apache.maven.wagon.proxy.ProxyInfo;
- import org.apache.maven.wagon.proxy.ProxyUtils;
-@@ -59,7 +59,7 @@
-  * 
-  * @author Benjamin Hanzelmann
-  */
--public class AsyncFetcher extends AbstractResourceFetcher {
-+public class AsyncFetcher implements ResourceFetcher {
- 
-   private static Logger log = LoggerFactory.getLogger(AsyncFetcher.class);
- 
-@@ -187,7 +187,7 @@
-     }
+ 
+ import org.eclipse.m2e.core.internal.MavenPluginActivator;
+ 
+ 
+-public class AetherClientResourceFetcher extends AbstractResourceFetcher {
++public class AetherClientResourceFetcher implements ResourceFetcher {
+ 
+   private AetherClient aetherClient;
+ 
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java.orig	2014-02-16 18:57:46.608176532 +0000
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/AetherClientResourceFetcher.java	2014-02-16 19:06:18.279005460 +0000
+@@ -73,6 +73,15 @@
+     aetherClient.close();
    }
  
--  @Override
-+    //@Override
-   public InputStream retrieve(String name) throws IOException, FileNotFoundException {
-     final String url = buildUrl(baseUrl, name);
++  public InputStream retrieve( String name )
++      throws IOException, FileNotFoundException {
++
++    String url = baseUrl + "/" + name;
++    Response response = aetherClient.get(url);
++    Closer closer = Closer.create();
++    return closer.register(response.getInputStream());
++  }
++
+   public void retrieve(String name, File targetFile) throws IOException, FileNotFoundException {
  
+     String url = baseUrl + "/" + name;
diff --git a/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch b/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch
index 948b066..eb56331 100644
--- a/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch
+++ b/eclipse-m2e-core-org.eclipse.m2e.launching-build.properties.patch
@@ -1,11 +1,12 @@
 --- org.eclipse.m2e.launching/build.properties.orig	2012-08-05 14:10:02.048873621 +0100
 +++ org.eclipse.m2e.launching/build.properties	2012-08-05 14:10:23.108472544 +0100
-@@ -14,8 +14,6 @@
+@@ -14,9 +14,6 @@
                 .,\
                 plugin.properties,\
                 icons/,\
 -               org.eclipse.m2e.cliresolver.jar,\
 -               org.eclipse.m2e.cliresolver30.jar,\
+-               org.eclipse.m2e.cliresolver31.jar,\
                 about.html,\
                 schema/
  jars.compile.order = .