diff --git a/build.properties b/build.properties
index 182bb4b997..e14dc6d0a7 100644
--- a/build.properties
+++ b/build.properties
@@ -4,7 +4,7 @@ plexus-archiver.version=1.0-alpha-8
 plexus-utils.version=1.4-alpha-1
 plexus-interactivity-api.version=1.0-alpha-4
 commons-cli.version=1.0
-wagon.version=1.0-beta-2
+wagon.version=1.0-beta-3-SNAPSHOT
 doxia.version=1.0-alpha-9-SNAPSHOT
 modello.version=1.0-alpha-13
 junit.version=3.8.1
diff --git a/build.xml b/build.xml
index 4c116693ac..5c6bdb5d22 100644
--- a/build.xml
+++ b/build.xml
@@ -194,7 +194,7 @@
       </sequential>
     </macrodef>
 
-    <modello file="maven-model/maven.mdo" version="4.0.0"/>
+    <modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
     <!-- DGF TODO turn this into a big <apply> task? write a custom task? -->
     <modello file="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo"/>
     <modello file="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo"/>
@@ -202,7 +202,7 @@
     <modello file="maven-profile/profiles.mdo"/>
     <modello file="maven-repository-metadata/src/main/mdo/metadata.mdo"/>
     <modello file="maven-repository-metadata/src/main/mdo/plugins.mdo"/>
-    <modello file="maven-settings/settings.mdo"/>
+    <modello file="maven-settings/src/main/mdo/settings.mdo"/>
   </target>
 
   <target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources">
diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
index 4fbd0884a2..3b1b604c3a 100644
--- a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+++ b/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
@@ -122,6 +122,8 @@ public class DefaultWagonManager
         }
         catch ( ComponentLookupException e1 )
         {
+            e1.printStackTrace();
+
             throw new UnsupportedProtocolException(
                 "Cannot find wagon which supports the requested protocol: " + protocol, e1 );
         }
diff --git a/pom.xml b/pom.xml
index 01ccd3885b..59139195a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
     <module>maven-tools</module>
   </modules>
   <properties>
-    <wagonVersion>1.0-beta-2</wagonVersion>
+    <wagonVersion>1.0-beta-3-SNAPSHOT</wagonVersion>
     <plexusVersion>1.0-alpha-16-SNAPSHOT</plexusVersion>
   </properties>
   <dependencies>