--- 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 @@
 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.common.ArchetypeArtifactManager;
 import org.apache.maven.archetype.source.ArchetypeDataSource;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -385,8 +384,8 @@
     return repositoryRegistry;
   }
 
-  public Archetype getArchetype() {
-    return lookup(Archetype.class);
+  public org.apache.maven.archetype.ArchetypeManager getArchetype() {
+    return lookup(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 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
 
-import org.apache.maven.archetype.Archetype;
+import org.apache.maven.archetype.ArchetypeManager;
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
 import org.apache.maven.archetype.source.ArchetypeDataSource;
 import org.apache.maven.archetype.source.ArchetypeDataSourceException;
@@ -67,7 +67,7 @@
     return getId();
   }
 
-  protected Archetype getArchetyper() {
+  protected ArchetypeManager getArchetyper() {
     return MavenPluginActivator.getDefault().getArchetype();
   }
 
--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java.orig	2012-07-19 15:39:54.000000000 +0100
+++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/ProjectConfigurationManager.java	2012-07-19 17:22:31.000000000 +0100
@@ -768,7 +768,7 @@
     }
   }
 
-  private org.apache.maven.archetype.Archetype getArchetyper() {
+  private org.apache.maven.archetype.ArchetypeManager getArchetyper() {
     return MavenPluginActivator.getDefault().getArchetype();
   }
 
--- org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java.orig	2012-08-08 14:46:26.924975744 +0100
+++ org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java	2012-08-04 14:51:10.000000000 +0100
@@ -790,7 +790,7 @@
               archetype.setArtifactId(archetypeArtifactId);
               archetype.setVersion(archetypeVersion);
               archetype.setRepository(repositoryUrl);
-              org.apache.maven.archetype.Archetype archetyper = MavenPluginActivator.getDefault().getArchetype();
+              org.apache.maven.archetype.ArchetypeManager archetyper = MavenPluginActivator.getDefault().getArchetype();
               archetyper.updateLocalCatalog(archetype);
 
               loadArchetypes(archetypeGroupId, archetypeArtifactId, archetypeVersion);