Index: pom.xml
===================================================================
--- pom.xml	(revision 405405)
+++ pom.xml	(working copy)
@@ -55,10 +55,15 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0.2</version>
+      <version>2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-project</artifactId>
       <version>2.0</version>
     </dependency>
Index: src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
===================================================================
--- src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java	(revision 405405)
+++ src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java	(working copy)
@@ -17,6 +17,7 @@
  */
 
 import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.manager.WagonConfigurationException;
 import org.apache.maven.model.DistributionManagement;
 import org.apache.maven.model.Site;
 import org.apache.maven.plugin.AbstractMojo;
@@ -120,14 +121,19 @@
         // TODO: work on moving this into the deployer like the other deploy methods
 
         Wagon wagon;
+
         try
         {
-            wagon = wagonManager.getWagon( repository.getProtocol() );
+            wagon = wagonManager.getConfiguredWagon( repository );
         }
         catch ( UnsupportedProtocolException e )
         {
             throw new MojoExecutionException( "Unsupported protocol: '" + repository.getProtocol() + "'", e );
         }
+        catch ( WagonConfigurationException e )
+        {
+            throw new MojoExecutionException( "Wagon configuration exception: '" + repository.getProtocol() + "'", e );
+        }
 
         if ( !wagon.supportsDirectoryCopy() )
         {