diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index fd69b8c6f0..adcfb01176 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -83,7 +83,7 @@ public class DefaultClassRealmManager
             {
                 try
                 {
-                    classRealm = world.newRealm( realmId );
+                    classRealm = world.newRealm( realmId, null );
 
                     if ( logger.isDebugEnabled() )
                     {
@@ -159,6 +159,9 @@ public class DefaultClassRealmManager
         // plexus-classworlds
         importingRealm.importFromParent( "org.codehaus.plexus.classworlds" );
 
+        // classworlds (for legacy code)
+        importingRealm.importFromParent( "org.codehaus.classworlds" );
+
         // plexus-container, plexus-component-annotations
         importingRealm.importFromParent( "org.codehaus.plexus.component" );
         importingRealm.importFromParent( "org.codehaus.plexus.configuration" );
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
index 886d5c0227..1ea45c74f4 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
@@ -1341,12 +1341,12 @@ public class DefaultLifecycleExecutor
 
         Xpp3Dom mojoConfiguration = mojoExecution.getConfiguration();
 
-        mojoConfiguration = extractMojoConfiguration( mojoConfiguration, mojoDescriptor );
-
         Xpp3Dom defaultConfiguration = getMojoConfiguration( mojoDescriptor );
 
         mojoConfiguration = Xpp3Dom.mergeXpp3Dom( mojoConfiguration, defaultConfiguration, Boolean.TRUE );
 
+        mojoConfiguration = extractMojoConfiguration( mojoConfiguration, mojoDescriptor );
+
         mojoExecution.setConfiguration( mojoConfiguration );
     }
 
diff --git a/pom.xml b/pom.xml
index 88c68fbd6c..7d7b1cf738 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
   <inceptionYear>2001</inceptionYear>
 
   <properties>
-    <classWorldsVersion>2.0.0</classWorldsVersion>
+    <classWorldsVersion>2.1.0-SNAPSHOT</classWorldsVersion>
     <commonsCliVersion>1.2</commonsCliVersion>
     <easyMockVersion>1.2_Java1.3</easyMockVersion>
     <junitVersion>3.8.2</junitVersion>