diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index 89b99772c..ed65056c5 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -80,6 +80,11 @@
       <artifactId>wagon-http</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http-lightweight</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index cf7a7fe87..e91e0936d 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -178,6 +178,12 @@
               org.apache.archiva.proxy.common;version=${project.version},
               org.apache.archiva.reports;version=${project.version},
               org.apache.archiva.xml;version=${project.version},
+              org.apache.archiva.admin.model;version=${project.version},
+              org.apache.archiva.admin.model.beans;version=${project.version},
+              org.apache.archiva.admin.model.managed;version=${project.version},
+              org.apache.archiva.admin.model.networkproxy;version=${project.version},
+              org.apache.archiva.admin.model.proxyconnector;version=${project.version},
+              org.apache.archiva.admin.model.remote;version=${project.version},
               org.apache.commons.collections;version="[3.2,4)",
               org.apache.commons.io*;version="[1.4,2)",
               org.apache.commons.configuration;version="[1.4,2)",