diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 1d7a724fb3..46254f26dc 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -58,6 +58,11 @@
       <artifactId>wagon-api</artifactId>
       <version>1.0-alpha-1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>maven</groupId>
+      <artifactId>wagon-http-lightweight</artifactId>
+      <version>1.0-alpha-1-SNAPSHOT</version>
+    </dependency>
   </dependencies>
   <distributionManagement>
     <site>
diff --git a/maven-core/src/bin/classworlds.conf b/maven-core/src/bin/classworlds.conf
index 46225e3514..0fb6c4659d 100644
--- a/maven-core/src/bin/classworlds.conf
+++ b/maven-core/src/bin/classworlds.conf
@@ -6,9 +6,15 @@ set maven.home default ${user.home}/m2
 load ${maven.home}/core/plexus-0.17.jar
 load ${maven.home}/core/xstream-1.0-SNAPSHOT.jar
 load ${maven.home}/core/xpp3-1.1.3.3.jar
-load ${maven.home}/core/maven-artifact-2.0-SNAPSHOT.jar
-load ${maven.home}/core/wagon-api-1.0-alpha-1-SNAPSHOT.jar
-load ${maven.home}/core/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar
 
 [plexus.core.maven]
-load ${maven.home}/lib/*.jar
+load ${maven.home}/lib/commons-cli-1.0-beta-2.jar
+load ${maven.home}/lib/maven-core-2.0-SNAPSHOT.jar
+load ${maven.home}/lib/maven-model-2.0-SNAPSHOT.jar
+load ${maven.home}/lib/maven-plugin-2.0-SNAPSHOT.jar
+load ${maven.home}/lib/ognl-2.5.1.jar
+load ${maven.home}/lib/plexus-artifact-container-1.0-alpha-1.jar
+load ${maven.home}/lib/plexus-i18n-1.0-beta-3.jar
+load ${maven.home}/lib/maven-artifact-2.0-SNAPSHOT.jar
+load ${maven.home}/lib/wagon-api-1.0-alpha-1-SNAPSHOT.jar
+load ${maven.home}/lib/wagon-http-lightweight-1.0-alpha-1-SNAPSHOT.jar