diff --git a/doc/pom.xml b/doc/pom.xml
index 763b6f7c1b..5035a3d714 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -9,6 +9,14 @@
     <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-doc</artifactId>
+
+  <!-- repeated here to avoid appending the artifactId -->
+  <scm>
+    <connection>scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity</connection>
+    <developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity</developerConnection>
+    <url>http://svn.sourceforge.net/viewcvs.cgi/acegisecurity/trunk/acegisecurity/</url>
+  </scm>
+
   <dependencies>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index a95cb4694a..00242db2a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,18 +49,19 @@
 
   <distributionManagement>
     <repository>
-      <id>acegi-sourceforge-releases</id>
+      <id>acegi.sourceforge.releases</id>
       <name>Acegi Releases Repository at Sourceforge</name>
       <url>scp://shell.sourceforge.net/home/groups/a/ac/acegisecurity/htdocs/repository/releases</url>
     </repository>
     <snapshotRepository>
-      <id>acegi-sourceforge-snapshots</id>
+      <id>acegi.sourceforge.snapshots</id>
       <name>Acegi Snapshots Repository at Sourceforge</name>
       <url>scp://shell.sourceforge.net/home/groups/a/ac/acegisecurity/htdocs/repository/snapshots</url>
     </snapshotRepository>
     <site>
-      <id>website</id>
-      <url>scp://shell.sourceforge.net/home/groups/a/ac/acegisecurity/htdocs</url>
+      <id>acegi.sourceforge.site</id>
+      <name>Acegi Website at Sourceforge</name>
+      <url>scp://shell.sourceforge.net/home/groups/a/ac/acegisecurity/htdocs/maven2</url>
     </site>
   </distributionManagement>
 
@@ -225,13 +226,19 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <includes>
-            <include implementation="java.lang.String">**/*Tests.class</include>
+            <include>**/*Tests.class</include>
           </includes>
           <excludes>
-            <exclude implementation="java.lang.String">**/Abstract*</exclude>
+            <exclude>**/Abstract*</exclude>
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+        <configuration>
+          <tagBase>https://svn.sourceforge.net/svnroot/acegisecurity/tags</tagBase>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -241,9 +248,50 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jxr-maven-plugin</artifactId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <links>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+            <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/logging/api/</link>
+            <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+            <link>http://www.junit.org/junit/javadoc/</link>
+            <link>http://logging.apache.org/log4j/docs/api/</link>
+            <link>http://jakarta.apache.org/regexp/apidocs/</link>
+            <link>http://jakarta.apache.org/velocity/api/</link>
+            <link>http://www.springframework.org/docs/api/</link>
+            <link>http://jakarta.apache.org/commons/lang/api/</link>
+            <link>http://developer.ja-sig.org/projects/cas/multiproject/cas-server/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/codec/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/collections/api/</link>
+            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+            <link>http://tomcat.apache.org/tomcat-5.0-doc/servletapi/</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </reporting>