diff --git a/maven-skin/pom.xml b/maven-skin/pom.xml
index 5131a89..ffaf557 100644
--- a/maven-skin/pom.xml
+++ b/maven-skin/pom.xml
@@ -20,14 +20,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
   <artifactId>maven-skin</artifactId>
-  <version>1.2</version>
+  <version>1.5</version>
   <name>JAMES Skin</name>
   <description>Apache JAMES Official Maven2 Site Skin</description>
 
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>james-parent</artifactId>
-    <version>1.2</version>
+    <version>1.5</version>
   </parent>
 
 
@@ -44,23 +44,6 @@
   </properties>
 
   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
-              </resourceBundles>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/maven-skin/stage/org.apache/jars/apache-jar-resource-bundle-1.2.jar b/maven-skin/stage/org.apache/jars/apache-jar-resource-bundle-1.2.jar
deleted file mode 100644
index 2d2c1b4..0000000
--- a/maven-skin/stage/org.apache/jars/apache-jar-resource-bundle-1.2.jar
+++ /dev/null
Binary files differ
diff --git a/pom.xml b/pom.xml
index 14e9fc2..b8b2f79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,21 @@
   <groupId>org.apache.james</groupId>
   <artifactId>james-parent</artifactId>
   <name>Apache JAMES Parent POM</name>
-  <version>1.2</version>
+  <version>1.5</version>
   <description>
     The Apache JAMES Parent POM
   </description>
+  
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>7</version>
+  </parent>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
   <prerequisites>
     <maven>2.0.6</maven>
   </prerequisites>
@@ -47,12 +57,18 @@
     <url>http://www.apache.org</url>
   </organization>
 
+  <ciManagement>
+    <system>hudson</system>
+    <url>http://hudson.zones.apache.org/hudson/view/James/</url>
+  </ciManagement>
+
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-5</version>
+          <version>2.0.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -87,7 +103,7 @@
       <email>norman at apache.org</email>
       <timezone>2</timezone>
       <roles>
-        <role>Developer</role>
+        <role>PMC Chair</role>
       </roles>
     </developer>
     <developer>
@@ -189,6 +205,33 @@
         </description>
       </properties>
     </developer>
+    <developer>
+      <id>mwiederkehr</id>
+      <name>Markus Wiederkehr</name>
+      <email>mwiederkehr at apache.org</email>
+      <timezone />
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>olegk</id>
+      <name>Oleg Kalnichevski</name>
+      <email>olegk at apache.org</email>
+      <timezone />
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>manolo</id>
+      <name>Manuel Carrasco Monino</name>
+      <email>manolo at apache.org</email>
+      <timezone />
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
   </developers>
 
   <contributors>
@@ -211,22 +254,12 @@
   </contributors>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/tags/james-parent-1.2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/tags/james-parent-1.2</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/tags/james-parent-1.2</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/tags/james-parent-1.5</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/tags/james-parent-1.5</developerConnection>
+    <url>http://svn.apache.org/viewvc/james/project/tags/james-parent-1.5</url>
   </scm>
 
   <distributionManagement>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-    </snapshotRepository>
     <!-- Each project must override this with their own -->
     <site>
       <id>james-parent-website</id>
@@ -234,162 +267,8 @@
     </site>
   </distributionManagement>
 
-  <repositories>
-    <repository>
-      <id>central</id>
-      <url>http://repo1.maven.org/maven2</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Main M2 Repository</name>
-      <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  
   <profiles>
-    <!-- parent profile: used to find skin dependency in stage -->
-    <profile>
-      <id>parent</id>
-      <repositories>
-        <repository>
-          <id>local-james-parent-stage</id>
-          <name>Apache JAMES parent stage repository folder</name>
-          <url>file://${basedir}/stage</url>
-          <layout>legacy</layout>
-          <releases>
-            <enabled>true</enabled>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <checksumPolicy>ignore</checksumPolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <!-- local profile: used to ignore remote repositories in a local build -->
-    <profile>
-      <id>local</id>
-      <repositories>
-        <repository>
-          <id>central</id>
-          <url>http://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>apache.releases</id>
-          <name>Apache Main M2 Repository</name>
-          <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Snapshot Repository</name>
-          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <!-- START SNIPPET: release-profile -->
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.0-alpha-3</version>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- We want to deploy the artifact to a staging location for perusal -->
-          <plugin>
-            <inherited>true</inherited>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-              <updateReleaseInfo>true</updateReleaseInfo>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.0.2</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- END SNIPPET: release-profile -->
+ <!-- Use inherited apache release profile -->
   </profiles>  
 
-</project>
\ No newline at end of file
+</project>
diff --git a/project/pom.xml b/project/pom.xml
index 1f32352..99dd6c3 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.apache.james</groupId>
   <artifactId>james-project</artifactId>
   <name>Apache JAMES Project</name>
-  <version>1.3</version>
+  <version>1.5</version>
   <description>
     The Apache JAMES Project
   </description>
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>james-parent</artifactId>
-    <version>1.2</version>
+    <version>1.5</version>
   </parent>
 
   <modules>
@@ -59,7 +59,35 @@
 
   <mailingLists>
     <mailingList>
-      <name>Apache James Website Developement</name>
+      <name>Server Development (including components)</name>
+      <subscribe>server-dev-subscribe@james.apache.org</subscribe>
+      <unsubscribe>server-dev-unsubscribe@james.apache.org</unsubscribe>
+      <post>server-dev@james.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Server User</name>
+      <subscribe>server-user-subscribe@james.apache.org</subscribe>
+      <unsubscribe>server-user-unsubscribe@james.apache.org</unsubscribe>
+      <post>server-user@james.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Mime4J</name>
+      <subscribe>mime4j-dev-subscribe@james.apache.org</subscribe>
+      <unsubscribe>mime4j-dev-unsubscribe@james.apache.org</unsubscribe>
+      <post>mime4j-dev@james.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/james-mime4j-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>General</name>
+      <subscribe>general-subscribe@james.apache.org</subscribe>
+      <unsubscribe>general-unsubscribe@james.apache.org</unsubscribe>
+      <post>general@james.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/james-general/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Website Development</name>
       <subscribe>site-dev-subscribe@james.apache.org</subscribe>
       <unsubscribe>site-dev-unsubscribe@james.apache.org</unsubscribe>
       <post>site-dev@james.apache.org</post>
diff --git a/project/server/2.2.0/pom.xml b/project/server/2.2.0/pom.xml
index 418c3a6..35a5baa 100644
--- a/project/server/2.2.0/pom.xml
+++ b/project/server/2.2.0/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.apache.james</groupId>
   <artifactId>james-server-site-2-2-0</artifactId>
   <name>JAMES Server 2.2.0 Documentation</name>
-  <version>1.2</version>
+  <version>1.5</version>
   <description>
     Apache JAMES Server 2.2.0 Documentation
   </description>
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>james-server-root</artifactId>
-    <version>1.2</version>
+    <version>1.5</version>
   </parent>
   <url>http://james.apache.org/server/2.2.0/</url>
   <inceptionYear>2006</inceptionYear>
@@ -41,4 +41,4 @@
       <url>scp://people.apache.org/www/james.apache.org/server/2.2.0/</url>
     </site>
   </distributionManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/project/server/pom.xml b/project/server/pom.xml
index 3ff296e..ff5ed21 100644
--- a/project/server/pom.xml
+++ b/project/server/pom.xml
@@ -22,7 +22,7 @@
   <groupId>org.apache.james</groupId>
   <artifactId>james-server-root</artifactId>
   <name>JAMES Server</name>
-  <version>1.2</version>
+  <version>1.5</version>
   <description>
     Apache JAMES Server
   </description>
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>james-project</artifactId>
-    <version>1.3</version>
+    <version>1.5</version>
   </parent>
   <modules>
     <module>2.2.0</module>
@@ -44,23 +44,6 @@
       <url>scp://people.apache.org/www/james.apache.org/server/</url>
     </site>
   </distributionManagement>
-  
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/JAMES</url>
-  </issueManagement>
-
-  <ciManagement>
-    <system>continuum</system>
-    <notifiers>
-      <notifier>
-        <type>mail</type>
-        <sendOnError />
-        <sendOnFailure />
-        <address>server-dev@james.apache.org</address>
-      </notifier>
-    </notifiers>
-  </ciManagement>
 
   <mailingLists>
     <mailingList>
@@ -85,4 +68,4 @@
   </mailingLists>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/project/server/src/site/site.xml b/project/server/src/site/site.xml
index b406c37..971f5a2 100644
--- a/project/server/src/site/site.xml
+++ b/project/server/src/site/site.xml
@@ -39,25 +39,19 @@
       <item name="James FAQ" href="/FAQ.html">
         <item name="James and Sendmail" href="/james_and_sendmail.html" />
       </item>
-      <item name="Wiki" href="http://wiki.apache.org/james" />
       <item name="Useful RFCs" href="/rfclist.html" />
+      <item name="Issue Tracker" href="http://issues.apache.org/jira/browse/JAMES" />
+      <item name="Source" href="http://svn.apache.org/viewvc/james/server/" />
     </menu>
     
-    <menu name="Documentation">
-      <!--
-      <item name="Head" href="/head/index.html" />
-      -->
+    <menu name="Documentation" inherit='bottom'>
+      <item name="Development 3.0" href="/head/index.html" />
+      <item name="Candidate 2.3.2" href="/2.3.2/index.html" />
       <item name="Server 2.3.1" href="/2.3.1/index.html" />
       <item name="Server 2.3.0" href="/2.3.0/index.html" />
       <item name="Server 2.2.0" href="/2.2.0/index.html" />
       <item name="Archive" href="/archive/document_archive.html" />
     </menu>
     
-    <menu name="Project" inherit="bottom">
-      <item name="Bug Database" href="http://issues.apache.org/jira/browse/JAMES" />
-      <item name="Source Code" href="http://svn.apache.org/viewvc/james/server/" />
-      <item name="TODO" href="/todo.html" />
-    </menu>
-    
   </body>
 </project>
diff --git a/project/server/src/site/xdoc/index.xml b/project/server/src/site/xdoc/index.xml
index 666b457..e098838 100644
--- a/project/server/src/site/xdoc/index.xml
+++ b/project/server/src/site/xdoc/index.xml
@@ -20,111 +20,206 @@
 <document>
   <properties>
     <title>Overview</title>
-    <author email="site-dev@james.apache.org">James Project Web Team</author>
+    <author email="site-dev@james.apache.org">James Project Team</author>
   </properties>
   <body>
     <section name="What is it?">
-      <p>The Apache Java Enterprise Mail Server (a.k.a. Apache James) is a 100% pure <b>Java SMTP and POP3 Mail server and NNTP News server</b>.  We have designed James to be a complete and portable enterprise mail engine solution based on currently available open protocols. </p>
-      <p>James is also a <i>mail application platform</i>.  We have developed a Java API to let you write Java code to process emails that we call the mailet API.  A <b>mailet</b> can generate an automatic reply, update a database, prevent spam, build a message archive, or whatever you can imagine.  A <b>matcher</b> determines whether your mailet should process an email in the server.  The James project hosts the Mailet API, and James provides an implementation of this mail application platform API.</p>
-      <p>James is based upon the Apache Avalon application framework, formerly a product of the Apache Avalon project (see "news" below).</p>
-      <p>James requires Java 1.4 (For further information you may want to search the web, our <a href="http://www.mail-archive.com/server-dev@james.apache.org/">dev</a> and <a href="http://www.mail-archive.com/server-user@james.apache.org/">user</a> mail archives or our <a href="http://wiki.apache.org/james">wiki</a>).</p>
-    </section>
-    <section name="releases">
-      <p>
-        <b>Latest and Stable: James v2.3.1</b>
-        <br/>
-James v2.3.1 is the current best release. Both <a href="http://james.apache.org/download.cgi">binary and source</a> distributions are available.</p>
-      <p>James v2.3.1 is a bugfix release to the James platform, with importent bugfixes.
-See the <a href="2.3.1/changelog.html">Change Log</a> for a detailed list of bugfixes.  <b>All
-users are urged to upgrade to v2.3.1 as soon as possible</b>.</p>
-      <p>Any bugs found in James are dealt with promptly.  Please provide feedback on the james-user and james-dev mailing lists.</p>
-      <p>
-        <b>Get your hands on the latest versions..</b>
-        <br/>We put significant milestones, and potential release candidates in the <a href="http://people.apache.org/dist/james/">download area.</a>
-        <br/>Whilst the quality of these versions cannot be guaranteed they may contain important bug fixes and cool new features.<br/>
+      <p>Apache James Server
       </p>
+      
+      <ul>
+      <li>Is 100% pure java capable of running on Java 1.4 onwards</li>
+      <li>Integrates protocols
+        <ul>
+          <li>Email
+            <ul>
+              <li><a href='http://james.apache.org/server/rfclist/smtp/rfc0821.txt'>
+<abbr title='Simple Mail Transport Protocol'>SMTP</abbr></a></li>
+              <li><a href='http://james.apache.org/server/rfclist/pop3/rfc1725.txt'>
+<abbr title='Post Office Protocol'>POP3</abbr></a>
+                <ul>
+                  <li>Outgoing server</li>
+                  <li>Incoming from POP3 accounts (FetchMail)</li>
+                </ul>
+              </li>
+              <li><a href='http://james.apache.org/server/rfclist/imap4/rfc2060.txt'>
+<abbr title='Internet Message Access Protocol'>IMAP</abbr></a> (James 3)
+                <ul> 
+                  <li>Server</li>
+                  <li><a href='http://james.apache.org/jsieve'>Sieve</a> 
+                  filtering into IMAP mailboxes for incoming mail</li>
+                </ul>
+              </li>
+            </ul>
+          </li>
+        </ul>
+        <ul>
+           <li><a href='http://james.apache.org/server/rfclist/nntp/rfc0977.txt'>
+<abbr title='Network News Transfer Protocol'>NNTP</abbr></a> (better known as news)</li>
+        </ul>
+      </li>
+      <li>Is based on open standards</li>
+      <li>Is a mailet container. Processing is delegated to independent, extensible, pluggable agents
+      specified by the <a href='http://james.apache.org/mailet/api'>Mailet API</a>. Any function
+      which is not already available (from <a href='http://james.apache.org/mailet'>James</a>
+      or from a third party) can be developed.</li>
+      <li>Is a modular, component based <a href='http://dbpedia.org/resource/Inversion_of_control'>IoC</a> 
+      mail platform
+      <ul>
+        <li>Based on mature, production proved <a href='http://excalibur.apache.org'>Apache Excalibur</a>
+        components</li>
+        <li>James 2 (production) uses the <a href='http://avalon.apache.org'>Avalon</a> framework. Avalon development
+        has now stopped but the framework is mature, stable and of proved production quality.</li>
+        <li><a href='http://james.apache.org/server/head'>James 3</a> (development) supports Spring and is moving
+        towards OSGI</li>
+      </ul>
+      </li>
+      </ul>
     </section>
-    <section name="Feature Status">
-      <table>
-        <tr>
-          <th>Item</th>
-          <th>Status</th>
-          <th>Since</th>
-          <th>First released</th>
-        </tr>
-        <tr>
-          <td>SMTP server</td>
-          <td>Stable</td>
-          <td>1.0</td>
-          <td>0.95</td>
-        </tr>
-        <tr>
-          <td>Mailet Engine</td>
-          <td>Stable</td>
-          <td>2.3</td>
-          <td>0.95</td>
-        </tr>
-        <tr>
-          <td>FileSystem mailboxes/spool</td>
-          <td>Stable</td>
-          <td>1.2</td>
-          <td>1.0</td>
-        </tr>
-        <tr>
-          <td>RDBMS mailboxes/spool</td>
-          <td>Stable</td>
-          <td>1.2</td>
-          <td>1.2</td>
-        </tr>
-        <tr>
-          <td>POP3 server</td>
-          <td>Stable</td>
-          <td>1.1</td>
-          <td>1.0</td>
-        </tr>
-        <tr>
-          <td>RDBMS - Users</td>
-          <td>Stable</td>
-          <td>1.2.1</td>
-          <td>1.2.1</td>
-        </tr>
-        <tr>
-          <td>LDAP Support - Users</td>
-          <td>Experimental</td>
-          <td>1.2</td>
-          <td>1.2</td>
-        </tr>
-        <tr>
-          <td>TLS Support - POP3</td>
-          <td>Experimental</td>
-          <td>1.2</td>
-          <td>1.2</td>
-        </tr>
-        <tr>
-          <td>Remote Manager</td>
-          <td>Stable</td>
-          <td>1.0</td>
-          <td>1.0</td>
-        </tr>
-        <tr>
-          <td>TLS Support - Remote Manager</td>
-          <td>Stable</td>
-          <td>1.2</td>
-          <td>1.2</td>
-        </tr>
-        <tr>
-          <td>NNTP server</td>
-          <td>Experimental</td>
-          <td>1.2</td>
-          <td>1.2</td>
-        </tr>
-        <tr>
-          <td>FetchMail</td>
-          <td>Stable</td>
-          <td>2.2</td>
-          <td>2.2</td>
-        </tr>
-      </table>
+    <section name="Releases">
+      <subsection name='Stable - James 2'>
+        <p>
+        James 2 is a mature, production ready code stream with minimal development. 
+        Use of the latest stable release is recommended.
+        </p>
+        <subsection name='Latest and Stable - James 2.3.2'>
+        <ul>
+          <li>Is the latest official stable release and is available for download 
+            <a href="http://james.apache.org/download.cgi#Apache%20James%20Server">here</a>.</li>
+          <li>
+          Is a bug fix point release. 
+          See <a href='2.3.2/release-notes.html'>release notes</a> for details.
+          </li>
+          </ul>
+        </subsection>
+        <subsection name='Proposal - James 2.4.0'>
+          <ul>
+          <li>Is a 
+          <a href='http://issues.apache.org/jira/browse/JAMES/fixforversion/12313985'>Proposed</a> 
+          minor revision upgrading to Java 1.5 and adding support for Java 1.6.
+          </li><li>
+          Some libraries developed for 
+          <a href='http://james.apache.org/server/head'>James 3</a> may be added,
+          allowing access to their features.
+          </li><li>
+          Feedback welcomed either through the <a href='http://james.apache.org/mail.html'>mailing lists</a>
+          or <a href='http://issues.apache.org/jira/browse/JAMES'>JIRA</a>.
+          </li>
+          </ul>
+        </subsection>
+      </subsection>
+      <subsection name='Development - James 3.0'>
+        <p>
+The <a href='http://james.apache.org/server/head'>James 3</a> code base has many 
+<a href='http://james.apache.org/server/head/jira-report.html'>new features</a>
+and major revisions to the architecture are ongoing.  
+</p><p>
+It is recommended only for advanced users who are willing to accept that
+development is ongoing and that they may need to participate actively.
+Users are strongly recommended to subscribe to the server-dev 
+<a href='http://james.apache.org/mail.html'>mailing list</a>.
+        </p>
+        <subsection name='Proposal - James 3.0 Milestone 1'>
+          <ul>
+          <li>Is a proposed milestone release allowing a preview of the James 3.0 features
+          </li><li>
+          Feedback welcomed either through the <a href='http://james.apache.org/mail.html'>mailing lists</a>
+          or <a href='http://issues.apache.org/jira/browse/JAMES'>JIRA</a>.
+          </li>
+          </ul>
+        </subsection>
+      </subsection>
+      </section>
+      <section name="Feature Matrix">
+        <table>
+          <tr>
+            <th>Item</th>
+            <th>Status</th>
+            <th>Since</th>
+            <th>First released</th>
+          </tr>
+          <tr>
+            <td>SMTP server</td>
+            <td>Stable</td>
+            <td>1.0</td>
+            <td>0.95</td>
+          </tr>
+          <tr>
+            <td>Mailet Engine</td>
+            <td>Stable</td>
+            <td>2.3</td>
+            <td>0.95</td>
+          </tr>
+          <tr>
+            <td>FileSystem mailboxes/spool</td>
+            <td>Stable</td>
+            <td>1.2</td>
+            <td>1.0</td>
+          </tr>
+          <tr>
+            <td>RDBMS mailboxes/spool</td>
+            <td>Stable</td>
+            <td>1.2</td>
+            <td>1.2</td>
+          </tr>
+          <tr>
+            <td>POP3 server</td>
+            <td>Stable</td>
+            <td>1.1</td>
+            <td>1.0</td>
+          </tr>
+          <tr>
+            <td>RDBMS - Users</td>
+            <td>Stable</td>
+            <td>1.2.1</td>
+            <td>1.2.1</td>
+          </tr>
+          <tr>
+            <td>LDAP Support - Users</td>
+            <td>Experimental</td>
+            <td>1.2</td>
+            <td>1.2</td>
+          </tr>
+          <tr>
+            <td>TLS Support - POP3</td>
+            <td>Experimental</td>
+            <td>1.2</td>
+            <td>1.2</td>
+          </tr>
+          <tr>
+            <td>Remote Manager</td>
+            <td>Stable</td>
+            <td>1.0</td>
+            <td>1.0</td>
+          </tr>
+          <tr>
+            <td>TLS Support - Remote Manager</td>
+            <td>Stable</td>
+            <td>1.2</td>
+            <td>1.2</td>
+          </tr>
+          <tr>
+            <td>NNTP server</td>
+            <td>Experimental</td>
+            <td>1.2</td>
+            <td>1.2</td>
+          </tr>
+          <tr>
+            <td>FetchMail</td>
+            <td>Stable</td>
+            <td>2.2</td>
+            <td>2.2</td>
+          </tr>
+          <tr>
+            <td>IMAP</td>
+            <td>Okay</td>
+            <td>3.0</td>
+            <td>3.0</td>
+          </tr>
+        </table>
+    </section>
+    <section name='TODO'>
+      <p>See <a href='todo.html'>here</a></p>
     </section>
   </body>
 </document>
diff --git a/project/src/site/site.xml b/project/src/site/site.xml
index 4d0324a..1763fa2 100644
--- a/project/src/site/site.xml
+++ b/project/src/site/site.xml
@@ -34,57 +34,44 @@
   <skin>
     <groupId>org.apache.james</groupId>
     <artifactId>maven-skin</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </skin>
     
   <body>
     <links>
-      <item name="JAMES Project" href="/index.html" />
-      <item name="Server" href="/server/index.html" />
-      <item name="Mailets" href="/mailet/index.html" />
-      <item name="jSPF" href="/jspf/index.html" />
-      <item name="Mime4J" href="/mime4j/index.html" />
-      <item name="JSieve" href="/jsieve/index.html" />
-      <item name="Postage" href="/postage/index.html" />
+      <item name="JAMES Project" href="http://james.apache.org/index.html" />
+      <item name="Hupa" href="http://james.apache.org/hupa/index.html" />
+      <item name="IMAP" href="http://james.apache.org/imap/index.html" />
+      <item name="JSieve" href="http://james.apache.org/jsieve/index.html" />
+      <item name="jSPF" href="http://james.apache.org/jspf/index.html" />
+      <item name="Mime4J" href="http://james.apache.org/mime4j/index.html" />
+      <item name="Mailets" href="http://james.apache.org/mailet/index.html" />
+      <item name="MPT" href="http://james.apache.org/mpt/index.html" />
+      <item name="Server" href="http://james.apache.org/server/index.html" />
+      <item name="Postage" href="http://james.apache.org/postage/index.html" />
+      <item name="jDKIM" href="http://james.apache.org/jdkim/index.html" />
     </links>
 
-    <menu name="About">
-      <item name="News" href="/newsarchive.html" />
+    <menu name="Download" inherit="bottom">
+      <item name='License' href='http://www.apache.org/licenses/LICENSE-2.0.txt'/>
+      <item name="Releases" href="http://james.apache.org/download.cgi"/>
+      <item name="Nightly builds" href="http://people.apache.org/builds/james/nightly/"/>
+      <item name='Latest (Continuous)' href='http://hudson.zones.apache.org/hudson/view/James/'/>
+    </menu>
+      
+    <menu name="About James " inherit='bottom'>
       <item name="Overview" href="/index.html" />
+      <item name="News" href="/newsarchive.html" />
       <item name="Mailing Lists" href="/mail.html" />
+      <item name="Contributing" href="/contribute.html" />
       <item name="Project Guidelines" href="/guidelines.html" />
       <item name="Wiki" href="http://wiki.apache.org/james" />
       <item name="Who We Are" href="/weare.html" />
-      <item name="Contributing" href="/contribute.html" />
-      <item name="Standards" href="/code-standards.html" />
       <item name="License" href="/license.html" />
     </menu>
 
-    <menu name="Downloads" inherit="bottom">
-      <item name="Stable releases" href="/download.cgi"/>
-      <item name="Unstable releases" href="/downloadunstable.cgi"/>
-      <item name="Nightly builds" href="http://people.apache.org/builds/james/nightly/"/>
-    </menu>
-      
-    <menu name="Translated">
-      <item name="Japanese (web)" href="http://james.terra-intl.com/"/>
-    </menu>
-      
-    <menu name="Related Projects">
-      <item name="Jakarta Commons" href="http://jakarta.apache.org/commons/index.html"/>
-      <item name="Ant" href="http://ant.apache.org/index.html"/>
-      <item name="Maven2" href="http://maven.apache.org/index.html"/>
-      <item name="Derby" href="http://db.apache.org/derby/index.html"/>
-      <item name="Avalon" href="http://avalon.apache.org/index.html"/>
-      <item name="DNSJava" href="http://www.dnsjava.org/index.html"/>
-    </menu>
-      
-    <menu name="Useful Information">
+    <menu name="Apache Software Foundation" inherit="bottom">
       <item name="Get Involved" href="http://jakarta.apache.org/site/getinvolved.html"/>
-      <item name="Reference Library" href="http://jakarta.apache.org/site/library.html"/>
-    </menu>
-
-    <menu name="Foundation">
       <item name="FAQ" href="http://apache.org/foundation/faq.html"/>
       <item name="Sponsorship" href="http://apache.org/foundation/sponsorship.html"/>
       <item name="Donations" href="http://apache.org/foundation/contributing.html"/>
diff --git a/project/src/site/xdoc/code-standards.xml b/project/src/site/xdoc/code-standards.xml
deleted file mode 100644
index c1343f7..0000000
--- a/project/src/site/xdoc/code-standards.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
--->
-<document>
-
- <properties>
-  <title>Coding Standards</title>
-  <author email="sergek@lokitech.com">Serge Knystautas</author>
- </properties>
-
-<body>
-
-<section name="Coding Standards">
-
-<p>
-    Submissions to the James project must follow the coding conventions
-    outlined in this document. James developers
-    are asked to follow coding conventions already present in the code.
-    (For example, if the existing code has the bracket on
-    the same line as the if statement, then all subsequent code
-    should also follow that convention.) Anything not
-    explicitly mentioned in this document should adhere to the
-    official
-    <a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun
-    Java Coding Conventions</a>.
-</p>
-
-<p>
-    <strong>Developers who commit code that does not follow
-    the coding conventions outlined in this document will be
-    responsible for fixing their own code.</strong>
-</p>
-
-<p>
-1. Spaces between parentheses are optional. The preference is to exclude
-extra spaces. Both of these conventions are acceptable:
-</p>
-
-<p>
-<source><![CDATA[
-
-if (foo)
-
-or
-
-if ( foo )
-]]></source>
-</p>
-
-<p>
-2. Four spaces. <strong>NO tabs</strong>. Period. The James
-mailing list receives cvs commit messages that are almost impossible
-to read if tabs are used.
-</p>
-
-<p>
-In Emacs-speak, this translates to the following command:
-
-(setq-default tab-width 4 indent-tabs-mode nil)
-</p>
-
-<p>
-3. Use Unix linefeeds for all .java source code files. Only platform-specific
-files (e.g. .bat files for Windows) should contain non-Unix linefeeds.
-</p>
-
-<p>
-4. Javadoc <strong>must</strong> exist on all methods. Contributing
-a missing javadoc for any method, class, variable, etc., will be GREATLY
-appreciated as this will help to improve the James project.
-</p>
-
-<p>
-5. The Jakarta Apache/James License <strong>MUST</strong> be placed
-at the top of every file.
-</p>
-
-</section>
-
-</body>
-</document>
diff --git a/project/src/site/xdoc/contribute.xml b/project/src/site/xdoc/contribute.xml
index b433172..8e22329 100644
--- a/project/src/site/xdoc/contribute.xml
+++ b/project/src/site/xdoc/contribute.xml
@@ -106,6 +106,73 @@
              happy to receive good documentation.
          </p>
          </section>
+         
+         <section name="Coding Standards">
+
+         <p>
+            Submissions to the James project must follow the coding conventions
+            outlined in this document. James developers
+            are asked to follow coding conventions already present in the code.
+            (For example, if the existing code has the bracket on
+            the same line as the if statement, then all subsequent code
+            should also follow that convention.) Anything not
+            explicitly mentioned in this document should adhere to the
+            official
+            <a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun
+            Java Coding Conventions</a>.
+         </p>
+        
+         <p>
+            <strong>Developers who commit code that does not follow
+            the coding conventions outlined in this document will be
+            responsible for fixing their own code.</strong>
+         </p>
+        
+         <p>
+        1. Spaces between parentheses are optional. The preference is to exclude
+        extra spaces. Both of these conventions are acceptable:
+         </p>
+        
+         <p>
+        <source><![CDATA[
+  
+  if (foo)
+  
+  or
+  
+  if ( foo )
+        ]]></source>
+        </p>
+        
+        <p>
+        2. Four spaces. <strong>NO tabs</strong>. Period. The James
+        mailing list receives commit messages that are almost impossible
+        to read if tabs are used.
+        </p>
+        
+        <p>
+        In Emacs-speak, this translates to the following command:
+        
+        (setq-default tab-width 4 indent-tabs-mode nil)
+        </p>
+        
+        <p>
+        3. Use Unix linefeeds for all .java source code files. Only platform-specific
+        files (e.g. .bat files for Windows) should contain non-Unix linefeeds.
+        </p>
+        
+        <p>
+        4. Javadoc <strong>must</strong> exist on all methods. Contributing
+        a missing javadoc for any method, class, variable, etc., will be GREATLY
+        appreciated as this will help to improve the James project.
+        </p>
+        
+        <p>
+        5. The standard Apache boilerplace <strong>MUST</strong> be placed
+        at the top of every file.
+        </p>
+        
+        </section>
     
         </body>
    </document>
diff --git a/project/src/site/xdoc/download.xml b/project/src/site/xdoc/download.xml
index 38f2658..bec3807 100644
--- a/project/src/site/xdoc/download.xml
+++ b/project/src/site/xdoc/download.xml
@@ -24,10 +24,10 @@
   </properties>
 <body>
 
-<section name="Downloading the Apache JAMES Mail Server">
+<section name="Downloading">
 
-<p>Use the links below to download the Apache JAMES Mail Server from one of
-our mirrors.  You <strong>must</strong> <a href="#Verify the integrity of the files">verify the
+<p>Use the links below to download the product from one of
+our mirrors.  You <strong>must</strong> <a href="#Verify_the_integrity_of_the_files">verify the
 integrity</a> of the downloaded files using signatures downloaded from
 our main distribution directory.</p>
 
@@ -36,7 +36,17 @@
 the <a href="http://archive.apache.org/dist/james/">archive download
 site.</a></p>
 
-</section>
+<ul>
+<li><a href='#Apache_James_Server'>Apache James Server</a></li>
+<li><a href='#Apache_Mime4J'>Apache Mime4j</a></li>
+<li><a href='#Apache_jSPF'>Apache jSPF</a></li>
+<li><a href='#Apache_JSieve'>Apache JSieve</a></li>
+<li><a href='#Apache_Mailet'>Apache Mailet</a></li>
+<li><a href='#Apache_Mailet_Base'>Apache Mailet Base</a></li>
+<li><a href='#Apache_Crypto_Mailets'>Apache Crypto Mailets</a></li>
+<li>The MailetDoc Plugin for Maven is available from the standard repositories</li>
+<li><a href='#Apache_MPT'>Apache MPT</a></li>
+</ul>
 
 <subsection name="Mirror">
 
@@ -66,203 +76,6 @@
 list of mirrors</a>.</p>
 
 </subsection>
-
-<section name="Apache JAMES 2.3.1 is the best available version">
-
-<p>This release has many enhancements and bug fixes over the previous
-release.  See the <a
-href="server/2.3.1/changelog.html">Change Log</a>
-for a detailed list of changes.  Some of the earlier defects could
-turn a JAMES mail server into an Open Relay.  All users of JAMES Server are urged to upgrade to version v2.3.1 as soon as
-possible.</p>
-
-<ul>
-
-<li>Binary (Unix TAR): <a
-href="[preferred]/james/server/binaries/james-binary-2.3.1.tar.gz">james-binary-2.3.1.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/binaries/james-binary-2.3.1.tar.gz.asc">PGP</a>]</li>
-
-<li>Binary (ZIP Format): <a
-href="[preferred]/james/server/binaries/james-binary-2.3.1.zip">james-binary-2.3.1.zip</a> [<a
-href="http://www.apache.org/dist/james/server/binaries/james-binary-2.3.1.zip.asc">PGP</a>]</li>
-
-<li>Mailet SDK (Unix TAR): <a
-href="[preferred]/james/server/binaries/james-MailetSDK-2.3.1.tar.gz">james-MailetSDK-2.3.1.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/binaries/james-MailetSDK-2.3.1.tar.gz.asc">PGP</a>]</li>
-
-<li>Mailet SDK (ZIP Format): <a
-href="[preferred]/james/server/binaries/james-MailetSDK-2.3.1.zip">james-MailetSDK-2.3.1.zip</a> [<a
-href="http://www.apache.org/dist/james/server/binaries/james-MailetSDK-2.3.1.zip.asc">PGP</a>]</li>
-
-<li>Source (Unix TAR): <a
-href="[preferred]/james/server/source/james-2.3.1-src.tar.gz">james-2.3.1-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-2.3.1-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source (ZIP Format): <a
-href="[preferred]/james/server/source/james-2.3.1-src.zip">james-2.3.1-src.zip</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-2.3.1-src.zip.asc">PGP</a>]</li>
-
-<li>Source with Avalon Phoenix binaries (Unix TAR): <a
-href="[preferred]/james/server/source/james-with-phoenix-2.3.1-src.tar.gz">james-with-phoenix-2.3.1-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-with-phoenix-2.3.1-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source with Avalon Phoenix binaries (ZIP Format): <a
-href="[preferred]/james/server/source/james-with-phoenix-2.3.1-src.zip">james-with-phoenix-2.3.1-src.zip</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-with-phoenix-2.3.1-src.zip.asc">PGP</a>]</li>
-
-<li><a
-href="[preferred]/james/server/binaries/">Other
-Binaries</a></li>
-
-</ul>
-
-</section>
-
-<subsection name="Apache JAMES 2.3.0 is the previous release">
-
-<ul>
-
-<li>Binary (Unix TAR): <a
-href="[preferred]/james/server/binaries/james-2.3.0.tar.gz">james-2.3.0.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/binaries/james-2.3.0.tar.gz.asc">PGP</a>]</li>
-
-<li>Binary (ZIP Format): <a
-href="[preferred]/james/server/binaries/james-2.3.0.zip">james-2.3.0.zip</a> [<a
-href="http://www.apache.org/dist/james/server/binaries/james-2.3.0.zip.asc">PGP</a>]</li>
-
-<li>Source (Unix TAR): <a
-href="[preferred]/james/server/source/james-2.3.0-src.tar.gz">james-2.3.0-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-2.3.0-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source (ZIP Format): <a
-href="[preferred]/james/server/source/james-2.3.0-src.zip">james-2.3.0-src.zip</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-2.3.0-src.zip.asc">PGP</a>]</li>
-
-<li>Source with Avalon Phoenix binaries (Unix TAR): <a
-href="[preferred]/james/server/source/james-with-phoenix-2.3.0-src.tar.gz">james-with-phoenix-2.3.0-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-with-phoenix-2.3.0-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source with Avalon Phoenix binaries (ZIP Format): <a
-href="[preferred]/james/server/source/james-with-phoenix-2.3.0-src.zip">james-with-phoenix-2.3.0-src.zip</a> [<a
-href="http://www.apache.org/dist/james/server/source/james-with-phoenix-2.3.0-src.zip.asc">PGP</a>]</li>
-
-<li><a
-href="[preferred]/james/server/binaries/">Other
-Binaries</a></li>
-
-</ul>
-
-</subsection>
-
-
-<section name="Apache Mime4J 0.5">
-
-<ul>
-
-<li>Binary (Unix TAR): <a
-href="[preferred]/james/mime4j/apache-mime4j-0.5-bin.tar.gz">apache-mime4j-0.5-bin.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-bin.tar.gz.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-bin.tar.gz.md5">MD5</a>]</li>
-
-<li>Binary (ZIP Format): <a
-href="[preferred]/james/mime4j/apache-mime4j-0.5-bin.zip">apache-mime4j-0.5-bin.zip</a> [<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-bin.zip.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-bin.zip.md5">MD5</a>]</li>
-
-<li>Source (Unix TAR): <a
-href="[preferred]/james/mime4j/apache-mime4j-0.5-src.tar.gz">apache-mime4j-0.5-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-src.tar.gz.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-src.tar.gz.md5">MD5</a>]</li>
-
-<li>Source (ZIP Format): <a
-href="[preferred]/james/mime4j/apache-mime4j-0.5-src.zip">apache-mime4j-0.5-src.zip</a> [<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-src.zip.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5-src.zip.md5">MD5</a>]</li>
-
-<li>Binary (JAR library only): <a
-href="[preferred]/james/mime4j/apache-mime4j-0.5.jar">apache-mime4j-0.5.jar</a> [<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5.jar.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.5.jar.md5">MD5</a>]</li>
-
-<li><a
-href="[preferred]/james/mime4j/">Other Files</a> (javadoc.jar, sha1 checksums...)</li>
-
-</ul>
-
-</section>
-
-<section name="Apache JAMES jSPF 0.9.6 is the latest jSPF stable version">
-
-<ul>
-
-<li>Binary (JAR): <a
-href="[preferred]/james/jspf/binaries/apache-jspf-0.9.6.jar">apache-jspf-0.9.6.jar</a> [<a
-href="http://www.apache.org/dist/james/jspf/binaries/apache-jspf-0.9.6.jar.asc">PGP</a>]</li>
-
-<li>Binary (ZIP Format): <a
-href="[preferred]/james/jspf/binaries/apache-jspf-0.9.6-bin.zip">apache-jspf-0.9.6-bin.zip</a> [<a
-href="http://www.apache.org/dist/james/jspf/binaries/apache-jspf-0.9.6-bin.zip.asc">PGP</a>]</li>
-
-<li>Binary (Unix TAR.GZ): <a
-href="[preferred]/james/jspf/binaries/apache-jspf-0.9.6-bin.tar.gz">apache-jspf-0.9.6-bin.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/jspf/binaries/apache-jspf-0.9.6-bin.tar.gz.asc">PGP</a>]</li>
-
-<li>Source (Unix TAR.GZ): <a
-href="[preferred]/james/jspf/source/apache-jspf-0.9.6-src.tar.gz">apache-jspf-0.9.6-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/jspf/source/apache-jspf-0.9.6-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source (ZIP Format): <a
-href="[preferred]/james/jspf/source/apache-jspf-0.9.6-src.zip">apache-jspf-0.9.6-src.zip</a> [<a
-href="http://www.apache.org/dist/james/jspf/source/apache-jspf-0.9.6-src.zip.asc">PGP</a>]</li>
-
-<li><a href="[preferred]/james/jspf/binaries/">Other Binaries</a></li>
-
-</ul>
-
-</section>
-<section name="Apache JSieve 0.2">
-
-<ul>
-
-<li>Binary (Unix TAR): <a
-href="[preferred]/james/apache-jsieve/0.2/apache-jsieve-0.2-bin.tar.gz">apache-jsieve-0.2-bin.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-bin.tar.gz.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-bin.tar.gz.md5">MD5</a>]</li>
-
-<li>Binary (ZIP Format): <a
-href="[preferred]/james/apache-jsieve/0.2/apache-jsieve-0.2-bin.zip">apache-jsieve-0.2-bin.zip</a> [<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-bin.zip.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-bin.zip.md5">MD5</a>]</li>
-
-<li>Source (Unix TAR): <a
-href="[preferred]/james/apache-jsieve/0.2/apache-jsieve-0.2-src.tar.gz">apache-jsieve-0.2-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-src.tar.gz.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-src.tar.gz.md5">MD5</a>]</li>
-
-<li>Source (ZIP Format): <a
-href="[preferred]/james/apache-jsieve/0.2/apache-jsieve-0.2-src.zip">apache-jsieve-0.2-src.zip</a> [<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-src.zip.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-src.zip.md5">MD5</a>]</li>
-
-<li><abbr title='Java ARchive'>JAR</abbr> library only: <a
-href="[preferred]/james/apache-jsieve/0.2/apache-jsieve-0.2.jar">apache-jsieve-0.2.jar</a> [<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2.jar.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2.jar.md5">MD5</a>]</li>
-
-<li>Javadocs only (for IDEs): <a
-href="[preferred]/james/apache-jsieve/0.2/apache-jsieve-0.2-javadoc.jar">apache-jsieve-0.2-javadoc.jar</a> [<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-javadoc.jar.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-javadoc.jar.md5">MD5</a>]</li>
-
-<li>Source <abbr title='Java ARchive'>JAR</abbr> only (for IDEs): <a
-href="[preferred]/james/apache-jsieve/0.2/apache-jsieve-0.2-sources.jar">apache-jsieve-0.2-sources.jar</a> [<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-sources.jar.asc">PGP</a>][<a
-href="http://www.apache.org/dist/james/apache-jsieve/0.2/apache-jsieve-0.2-sources.jar.md5">MD5</a>]</li>
-
-</ul>
-
-</section>
-
 <subsection name="Verify the integrity of the files">
 
 <p>It is essential that you verify the integrity of the downloaded
@@ -292,16 +105,299 @@
 </code></p>
 
 </subsection>
+</section>
 
-<section name="Unstable releases and Nightlies">
+<section name='Apache James Server'>
+<subsection name="Apache JAMES 2.3.2 is the best available version">
+
+<p>This release has many enhancements and bug fixes over the previous
+release.  See the <a
+href="http://james.apache.org/server/2.3.2/release-notes.html">Release Notes</a>
+for a detailed list of changes.  Some of the earlier defects could
+turn a JAMES mail server into an Open Relay.  All users of JAMES Server are urged to upgrade to version v2.3.1 as soon as
+possible.</p>
+
+<ul>
+
+<li>Binary (Unix TAR): <a
+href="[preferred]/james/server/apache-james-2.3.2.tar.gz">james-binary-2.3.2.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/server/apache-james-2.3.2.tar.gz.asc">PGP</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/server/apache-james-2.3.2.zip">james-binary-2.3.2.zip</a> [<a
+href="http://www.apache.org/dist/james/server/apache-james-2.3.2.zip.asc">PGP</a>]</li>
+
+<li>Source (Unix TAR): <a
+href="[preferred]/james/server/apache-james-2.3.2-src.tar.gz">james-2.3.2-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/server/apache-james-2.3.2-src.tar.gz.asc">PGP</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/server/apache-james-2.3.2-src.zip">james-2.3.2-src.zip</a> [<a
+href="http://www.apache.org/dist/james/server/apache-james-2.3.2-src.zip.asc">PGP</a>]</li>
+
+</ul>
+
+<subsection name="Earlier Releases">
+<p>
+Are now <a href='http://archive.apache.org/dist/james/server'>archived</a>.
+</p>
+</subsection>
+</subsection>
+</section>
+
+<section name="Apache Mime4J">
+<p>Apache Mime4J 0.6 is the latest stable version:</p>
+<ul>
+
+<li>Binary (Unix TAR): <a
+href="[preferred]/james/mime4j/apache-mime4j-0.6-bin.tar.gz">apache-mime4j-0.6-bin.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-bin.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-bin.tar.gz.md5">MD5</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/mime4j/apache-mime4j-0.6-bin.zip">apache-mime4j-0.6-bin.zip</a> [<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-bin.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-bin.zip.md5">MD5</a>]</li>
+
+<li>Source (Unix TAR): <a
+href="[preferred]/james/mime4j/apache-mime4j-0.6-src.tar.gz">apache-mime4j-0.6-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-src.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-src.tar.gz.md5">MD5</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/mime4j/apache-mime4j-0.6-src.zip">apache-mime4j-0.6-src.zip</a> [<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-src.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6-src.zip.md5">MD5</a>]</li>
+
+<li>Binary (JAR library only): <a
+href="[preferred]/james/mime4j/apache-mime4j-0.6.jar">apache-mime4j-0.6.jar</a> [<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/mime4j/apache-mime4j-0.6.jar.md5">MD5</a>]</li>
+
+<li><a
+href="[preferred]/james/mime4j/">Other Files</a> (javadoc.jar, sha1 checksums...)</li>
+
+</ul>
+
+</section>
+
+<section name="Apache jSPF">
+<p>Apache James jSPF 0.9.7 is the latest jSPF stable version:</p>
+<ul>
+
+<li>Binary Resolver (JAR): <a
+href="[preferred]/james/jspf/binaries/apache-jspf-resolver-0.9.7.jar">apache-jspf-resolver-0.9.7.jar</a> [<a
+href="http://www.apache.org/dist/james/jspf/binaries/apache-jspf-resolver-0.9.7.jar.asc">PGP</a>]</li>
+
+<li>Binary Tester (JAR): <a
+href="[preferred]/james/jspf/binaries/apache-jspf-tester-0.9.7.jar">apache-jspf-tester-0.9.7.jar</a> [<a
+href="http://www.apache.org/dist/james/jspf/binaries/apache-jspf-tester-0.9.7.jar.asc">PGP</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/jspf/binaries/apache-jspf-0.9.7-bin.zip">apache-jspf-0.9.7-bin.zip</a> [<a
+href="http://www.apache.org/dist/james/jspf/binaries/apache-jspf-0.9.7-bin.zip.asc">PGP</a>]</li>
+
+<li>Binary (Unix TAR.GZ): <a
+href="[preferred]/james/jspf/binaries/apache-jspf-0.9.7-bin.tar.gz">apache-jspf-0.9.7-bin.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/jspf/binaries/apache-jspf-0.9.7-bin.tar.gz.asc">PGP</a>]</li>
+
+<li>Source (Unix TAR.GZ): <a
+href="[preferred]/james/jspf/source/apache-jspf-0.9.7-src.tar.gz">apache-jspf-0.9.7-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/jspf/source/apache-jspf-0.9.7-src.tar.gz.asc">PGP</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/jspf/source/apache-jspf-0.9.7-src.zip">apache-jspf-0.9.7-src.zip</a> [<a
+href="http://www.apache.org/dist/james/jspf/source/apache-jspf-0.9.7-src.zip.asc">PGP</a>]</li>
+
+<li><a href="[preferred]/james/jspf/binaries/">Other Binaries</a></li>
+
+</ul>
+
+</section>
+<section name="Apache JSieve">
+<p>Apache JSieve 0.3 is the latest stable version:</p>
+<ul>
+
+<li>Binary (Unix TAR): <a
+href="[preferred]/james/apache-jsieve/0.3/apache-james-jsieve-0.3-bin.tar.gz">apache-jsieve-0.3-bin.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-bin.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-bin.tar.gz.md5">MD5</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/apache-jsieve/0.3/apache-james-jsieve-0.3-bin.zip">apache-jsieve-0.3-bin.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-bin.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-bin.zip.md5">MD5</a>]</li>
+
+<li>Source (Unix TAR): <a
+href="[preferred]/james/apache-jsieve/0.3/apache-james-jsieve-0.3-src.tar.gz">apache-jsieve-0.3-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-src.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-src.tar.gz.md5">MD5</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/apache-jsieve/0.3/apache-james-jsieve-0.3-src.zip">apache-jsieve-0.3-src.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-src.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-james-jsieve-0.3-src.zip.md5">MD5</a>]</li>
+
+<li><abbr title='Java ARchive'>JAR</abbr> library only: <a
+href="[preferred]/james/apache-jsieve/0.3/apache-jsieve-0.3.jar">apache-jsieve-0.3.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-jsieve-0.3.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-jsieve-0.3.jar.md5">MD5</a>]</li>
+
+<li>Javadocs only (for IDEs): <a
+href="[preferred]/james/apache-jsieve/0.3/apache-jsieve-0.3-javadoc.jar">apache-jsieve-0.3-javadoc.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-jsieve-0.3-javadoc.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-jsieve-0.3-javadoc.jar.md5">MD5</a>]</li>
+
+<li>Source <abbr title='Java ARchive'>JAR</abbr> only (for IDEs): <a
+href="[preferred]/james/apache-jsieve/0.3/apache-jsieve-0.3-sources.jar">apache-jsieve-0.3-sources.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-jsieve-0.3-sources.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-jsieve/0.3/apache-jsieve-0.3-sources.jar.md5">MD5</a>]</li>
+
+</ul>
+
+</section>
+
+<section name="Apache Mailet">
+<p>Apache Mailet 2.4 is the latest stable version:</p>
+<ul>
+
+<li>Binary (Unix TAR): <a
+href="[preferred]/james/apache-mailet/2.4/apache-mailet-2.4.tar.gz">apache-mailet-2.4.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4.tar.gz.md5">MD5</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/apache-mailet/2.4/apache-mailet-2.4.zip">apache-mailet-2.4.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4.zip.md5">MD5</a>]</li>
+
+<li>Source (Unix TAR): <a
+href="[preferred]/james/apache-mailet/2.4/apache-mailet-2.4-src.tar.gz">apache-mailet-2.4-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4-src.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4-src.tar.gz.md5">MD5</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/apache-mailet/2.4/apache-mailet-2.4-src.zip">apache-mailet-2.4-src.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4-src.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4-src.zip.md5">MD5</a>]</li>
+
+<li><abbr title='Java ARchive'>JAR</abbr> library only: <a
+href="[preferred]/james/apache-mailet/2.4/apache-mailet-2.4.jar">apache-mailet-2.4.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet/2.4/apache-mailet-2.4.jar.md5">MD5</a>]</li>
+
+</ul>
+
+</section>
+
+<section name="Apache Mailet Base">
+<p>Apache Mailet Base 1.0 is the latest stable version:</p>
+<ul>
+
+<li>Binary (Unix TAR): <a
+href="[preferred]/james/apache-mailet-base/1.0/apache-mailet-base-1.0-bin.tar.gz">apache-mailet-base-1.0.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-bin.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-bin.tar.gz.md5">MD5</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/apache-mailet-base/1.0/apache-mailet-base-1.0-bin.zip">apache-mailet-base-1.0.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-bin.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-bin.zip.md5">MD5</a>]</li>
+
+<li>Source (Unix TAR): <a
+href="[preferred]/james/apache-mailet-base/1.0/apache-mailet-base-1.0-src.tar.gz">apache-mailet-base-1.0-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-src.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-src.tar.gz.md5">MD5</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/apache-mailet-base/1.0/apache-mailet-base-1.0-src.zip">apache-mailet-base-1.0-src.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-src.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-src.zip.md5">MD5</a>]</li>
+
+<li>Source (Jar Format): <a
+href="[preferred]/james/apache-mailet-base/1.0/apache-mailet-base-1.0-sources.jar">apache-mailet-base-1.0-sources.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-sources.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0-sources.jar.md5">MD5</a>]</li>
+
+<li><abbr title='Java ARchive'>JAR</abbr> library only: <a
+href="[preferred]/james/apache-mailet-base/1.0/apache-mailet-base-1.0.jar">apache-mailet-base-1.0.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-mailet-base/1.0/apache-mailet-base-1.0.jar.md5">MD5</a>]</li>
+
+</ul>
+
+</section>
+
+<section name="Apache Crypto Mailets">
+<p>Apache Crypto Mailets 1.0 is the latest stable version:</p>
+<ul>
+
+<li>Binary (Unix TAR): <a
+href="[preferred]/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-bin.tar.gz">apache-crypto-mailets-1.0.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-bin.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-bin.tar.gz.md5">MD5</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-bin.zip">apache-crypto-mailets-1.0.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-bin.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-bin.zip.md5">MD5</a>]</li>
+
+<li>Source (Unix TAR): <a
+href="[preferred]/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-src.tar.gz">apache-crypto-mailets-1.0-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-src.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-src.tar.gz.md5">MD5</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-src.zip">apache-crypto-mailets-1.0-src.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-src.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-src.zip.md5">MD5</a>]</li>
+
+<li>Source (Jar Format): <a
+href="[preferred]/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-sources.jar">apache-crypto-mailets-1.0-sources.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-sources.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0-sources.jar.md5">MD5</a>]</li>
+
+<li><abbr title='Java ARchive'>JAR</abbr> library only: <a
+href="[preferred]/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0.jar">apache-crypto-mailets-1.0.jar</a> [<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0.jar.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-crypto-mailets/1.0/apache-crypto-mailets-1.0.jar.md5">MD5</a>]</li>
+
+</ul>
+</section>
+
+<section name="Apache MPT">
+<p>Apache MPT 0.1 is the latest stable version:</p>
+<ul>
+
+<li>Binary (Unix TAR): <a
+href="[preferred]/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-bin.tar.gz">apache-james-mpt-0.1.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-bin.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-bin.tar.gz.md5">MD5</a>]</li>
+
+<li>Binary (ZIP Format): <a
+href="[preferred]/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-bin.zip">apache-james-mpt-0.1.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-bin.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-bin.zip.md5">MD5</a>]</li>
+
+<li>Source (Unix TAR): <a
+href="[preferred]/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-src.tar.gz">apache-james-mpt-0.1-src.tar.gz</a> [<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-src.tar.gz.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-src.tar.gz.md5">MD5</a>]</li>
+
+<li>Source (ZIP Format): <a
+href="[preferred]/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-src.zip">apache-james-mpt-0.1-src.zip</a> [<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-src.zip.asc">PGP</a>][<a
+href="http://www.apache.org/dist/james/apache-james-mpt/apache-james-mpt/0.1/apache-james-mpt-0.1-src.zip.md5">MD5</a>]</li>
+
+<li>Jars (including source and javadocs) for the modules are distributed through the standard 
+<a href='http://maven.apache.org'>Maven</a> repositories.</li>
+</ul>
+</section>
+
+<section name="Nightly Builds">
 
 <p>The software listed above represents the latest Release Build
-available from the Apache JAMES Project.  From time to time, we also
-make available <a href="/downloadunstable.cgi">Unstable releases</a>.
-Unstable releases are announced on the General mailing list (general&#64;james.apache.org).
-<!--  workaround for a doxia bug -->
-<br /><br />
-</p>
+available from the Apache JAMES Project.</p>
 
 <p>The JAMES project also provides 
 <a href="http://people.apache.org/builds/james/nightly/">Nighly Builds</a>:
diff --git a/project/src/site/xdoc/downloadunstable.xml b/project/src/site/xdoc/downloadunstable.xml
deleted file mode 100644
index e204a85..0000000
--- a/project/src/site/xdoc/downloadunstable.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
--->
-<document>
-  <properties>
-    <author email="server-dev@james.apache.org">Apache James Mail Server Project</author>
-    <title>Download</title>
-  </properties>
-<body>
-
-<section name="Downloading the Apache JAMES Unstable releases">
-
-<p>Use the links below to download the Apache JAMES products from one of
-our mirrors.  You <strong>must</strong> <a href="#Verify the integrity of the files">verify the
-integrity</a> of the downloaded files using signatures downloaded from
-our main distribution directory.</p>
-
-<p>Only current recommended releases are available on the main
-distribution site and its mirrors.  Older releases are available from
-the <a href="http://archive.apache.org/dist/james/">archive download
-site.</a></p>
-
-</section>
-
-<subsection name="Mirror">
-
-<p>[if-any logo]
-<a href="[link]"><img align="right" src="[logo]" border="0" /></a>[end]
-The currently selected mirror is <b>[preferred]</b>.  If you encounter a
-problem with this mirror, please select another mirror.  If all
-mirrors are failing, there are <i>backup</i> mirrors (at the end of
-the mirrors list) that should be available.</p>
-
-<form action="[location]" method="get" id="SelectMirror">
-Other mirrors: <select name="Preferred">
-[if-any http]
-  [for http]<option value="[http]">[http]</option>[end]
-[end]  
-[if-any ftp]
-  [for ftp]<option value="[ftp]">[ftp]</option>[end]
-[end]
-[if-any backup]
-  [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-[end]
-</select>
-<input type="submit" value="Change" />     
-</form>
-
-<p>You may also consult the <a href="http://www.apache.org/mirrors/">complete
-list of mirrors</a>.</p>
-
-</subsection>
-
-<section name="No updated unstable releases for Apache JAMES Server">
-<p>Apache JAMES server 2.3.1 has been released and no new unstable releases have been released.
-Please go to the <a href="/download.cgi">stable releases download page</a> to download it.
-</p>
-</section>
-<!--
-<section name="Apache JAMES Server 2.3.1 RC1 is the latest unstable version">
-
-<p>This release has many enhancements and bug fixes over the previous
-release.  See the <a href="server/2.3.1/changelog.html">Change Log</a>
-for a detailed list of changes.</p>
-
-<ul>
-
-<li>Binary (Unix TAR): <a
-href="[preferred]/james/server/rc/binaries/james-binary-2.3.1rc1.tar.gz">james-binary-2.3.1rc1.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/rc/binaries/james-binary-2.3.1rc1.tar.gz.asc">PGP</a>]</li>
-
-<li>Binary (ZIP Format): <a
-href="[preferred]/james/server/binaries/james-binary-2.3.1rc1.zip">james-binary-2.3.1rc1.zip</a> [<a
-href="http://www.apache.org/dist/james/server/rc/binaries/james-binary-2.3.1rc1.zip.asc">PGP</a>]</li>
-
-<li>Mailet SDK (Unix TAR): <a
-href="[preferred]/james/server/rc/binaries/james-MailetSDK-2.3.1rc1.tar.gz">james-MailetSDK-2.3.1rc1.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/rc/binaries/james-MailetSDK-2.3.1rc1.tar.gz.asc">PGP</a>]</li>
-
-<li>Mailet SDK (ZIP Format): <a
-href="[preferred]/james/server/binaries/james-MailetSDK-2.3.1rc1.zip">james-MailetSDK-2.3.1rc1.zip</a> [<a
-href="http://www.apache.org/dist/james/server/rc/binaries/james-MailetSDK-2.3.1rc1.zip.asc">PGP</a>]</li>
-
-<li>Source (Unix TAR): <a
-href="[preferred]/james/server/source/james-2.3.1-src.tar.gz">james-2.3.1rc1-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/rc/source/james-2.3.1rc1-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source (ZIP Format): <a
-href="[preferred]/james/server/rc/source/james-2.3.1rc1-src.zip">james-2.3.1rc1-src.zip</a> [<a
-href="http://www.apache.org/dist/james/server/rc/source/james-2.3.1rc1-src.zip.asc">PGP</a>]</li>
-
-<li>Source with Avalon Phoenix binaries (Unix TAR): <a
-href="[preferred]/james/server/rc/source/james-with-phoenix-2.3.1rc1-src.tar.gz">james-with-phoenix-2.3.1rc1-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/server/rc/source/james-with-phoenix-2.3.1rc1-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source with Avalon Phoenix binaries (ZIP Format): <a
-href="[preferred]/james/server/rc/source/james-with-phoenix-2.3.1rc1-src.zip">james-with-phoenix-2.3.1rc1-src.zip</a> [<a
-href="http://www.apache.org/dist/james/server/rc/source/james-with-phoenix-2.3.1rc1-src.zip.asc">PGP</a>]</li>
-
-<li><a
-href="[preferred]/james/server/rc/binaries/">Other
-Binaries</a></li>
-
-</ul>
-
-</section>
--->
-
-<section name="No updated unstable releases for Apache JAMES jSPF">
-<p>Apache JAMES jSPF 0.9.6 has been released and no new unstable releases have been released.
-Please go to the <a href="/download.cgi">stable releases download page</a> to download it.
-</p>
-</section>
-
-<!--
-<section name="Apache JAMES jSPF 0.9.5 is the latest jSPF unstable version">
-
-<ul>
-
-<li>Binary (JAR): <a
-href="[preferred]/james/jspf/beta/bin/apache-jspf-0.9.5.jar">apache-jspf-0.9.5.jar</a> [<a
-href="http://www.apache.org/dist/james/jspf/beta/bin/apache-jspf-0.9.5.jar.asc">PGP</a>]</li>
-
-<li>Binary (ZIP Format): <a
-href="[preferred]/james/jspf/beta/bin/apache-jspf-0.9.5-bin.zip">apache-jspf-0.9.5-bin.zip</a> [<a
-href="http://www.apache.org/dist/james/jspf/beta/bin/apache-jspf-0.9.5-bin.zip.asc">PGP</a>]</li>
-
-<li>Binary (Unix TAR.GZ): <a
-href="[preferred]/james/jspf/beta/bin/apache-jspf-0.9.5-bin.tar.gz">apache-jspf-0.9.5-bin.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/jspf/beta/bin/apache-jspf-0.9.5-bin.tar.gz.asc">PGP</a>]</li>
-
-<li>Source (Unix TAR.GZ): <a
-href="[preferred]/james/jspf/beta/src/apache-jspf-0.9.5-src.tar.gz">apache-jspf-0.9.5-src.tar.gz</a> [<a
-href="http://www.apache.org/dist/james/jspf/beta/src/apache-jspf-0.9.5-src.tar.gz.asc">PGP</a>]</li>
-
-<li>Source (ZIP Format): <a
-href="[preferred]/james/jspf/beta/src/apache-jspf-0.9.5-src.zip">apache-jspf-0.9.5-src.zip</a> [<a
-href="http://www.apache.org/dist/james/jspf/beta/src/apache-jspf-0.9.5-src.zip.asc">PGP</a>]</li>
-
-<li><a href="[preferred]/james/jspf/beta/bin/">Other Binaries</a></li>
-
-</ul>
-
-</section>
--->
-<section name="No updated unstable releases for Apache Mime4J">
-<p>Apache Mime4J 0.4 has been released an no new unstable releases have been released.
-Please go to the <a href="/download.cgi">stable releases download page</a> to download it.
-</p>
-</section>
-
-<subsection name="Verify the integrity of the files">
-
-<p>It is essential that you verify the integrity of the downloaded
-files using the PGP or MD5 signatures.</p>
-
-<p>The PGP signatures can be verified using PGP or GPG.  First
-download the <a href="http://www.apache.org/dist/james/KEYS">KEYS</a>
-as well as the <code>asc</code> signature file for the particular
-distribution.  Make sure you get these files from the <a
-href="http://www.apache.org/dist/james/">main distribution
-directory</a>, rather than from a mirror. Then verify the signatures
-using</p>
-
-<p><code>
-% pgpk -a KEYS<br />
-% pgpv james-<i>version</i>.tar.gz.asc<br />
-</code>
-<em>or</em><br />
-<code>
-% pgp -ka KEYS<br />
-% pgp james-<i>version</i>.tar.gz.asc<br />
-</code>
-<em>or</em><br />
-<code>
-% gpg --import KEYS<br />
-% gpg --verify james-<i>version</i>.tar.gz.asc
-</code></p>
-
-</subsection>
-
-<section name="Stable releases or Nightlies">
-
-<p>The software listed above represents the latest unstable builds
-available from the Apache JAMES Project.
-You can download Stable Releases <a href="/download.cgi">here</a>.
-Unstable releases are announced on the General mailing list (general&#64;james.apache.org).
-<!--  workaround for a doxia bug -->
-<br /><br />
-</p>
-
-<p>The JAMES project also provides 
-<a href="http://people.apache.org/builds/james/nightly/">Nighly Builds</a>:
-<u>periodic snapshots during development</u>.  Generally, these are considered
-stable snapshots, but they have not undergone as much testing as a
-Release Build, nor have they been voted upon for release by the
-developer community.  These are simply convenient test builds.
-Sometimes the purpose for a Nightly Build could be soliciting feedback on
-a specific change.  
-</p>
-
-
-</section>
-
-</body>
-</document>
diff --git a/project/src/site/xdoc/index.xml b/project/src/site/xdoc/index.xml
index 31c717f..2009233 100644
--- a/project/src/site/xdoc/index.xml
+++ b/project/src/site/xdoc/index.xml
@@ -8,16 +8,50 @@
    <div id="newsboxspacer">
      <div id="newsbox">
     <subsection name="News">
-        <ul>
-        <li>Aug/2008 - <ul>
-        <li><a href="newsarchive.html#08262008"><strong>Apache JSieve 0.2</strong> released</a></li>
-        <li><a href="newsarchive.html#08222008"><strong>Mime4j 0.4</strong> released</a></li>
+      <ul>
+        <li>Oct/2009 - <ul>
+        <li><a href="newsarchive.html#15102009"><strong>jDKIM</strong>, a Java DKIM implementation, joins JAMES as sub-project</a></li>
         </ul>
         </li>
-        <li>Apr/2008 - <a href="newsarchive.html#04082008"><strong>jSPF 0.9.6</strong> released</a></li>
-        <li>Mar/2008 - <a href="newsarchive.html#03192008">Project ideas for Google Summer of Code '08</a></li>
+        <li>Sep/2009 - <ul>
+        <li><a href="newsarchive.html#25092009"><strong>Hupa</strong>, a GWT based webmail, joins JAMES as sub-project</a></li>
         </ul>
-    <i>Read all the news in full in the <a href="newsarchive.html">News Archive</a></i><br/>
+        </li>
+        <li>Aug/2009 - <ul>
+        <li><a href="newsarchive.html#31082009"><strong>Apache James 2.3.2</strong> released</a></li>
+        </ul>
+        </li>
+        <li>Jul/2009 - <ul>
+        <li><a href="newsarchive.html#02072009"><strong>Apache MPT 0.1</strong> released</a></li>
+        </ul>
+        </li>
+        <li>Jun/2009 - <ul>
+        <li><a href="newsarchive.html#25062009"><strong>Apache jSPF 0.9.7</strong> released</a></li>   
+        <li><a href="newsarchive.html#18062009"><strong>Apache JSieve 0.3</strong> released</a></li>
+        </ul>
+        </li>
+        <li>May/2009 - <ul>
+        <li><a href="newsarchive.html#14152009"><strong>Apache Crypto Mailets 1.0</strong> released</a></li>
+        </ul>
+        </li>
+        <li>Apr/2009 - <ul>
+        <li><a href="newsarchive.html#01042009"><strong>Apache Mailet Base 1.0</strong> released</a></li>
+        </ul>
+        </li>
+        <li>Mar/2009 - <ul>
+        <li><a href="newsarchive.html#08032009"><strong>Mime4j 0.6</strong> released</a></li>
+        </ul>
+        </li>
+        <li>Feb/2009 - <ul>
+        <li><a href="newsarchive.html#01052009"><strong>MailetDocs Maven Plugin 0.1</strong> released</a></li>
+        </ul>
+        </li>
+        <li>Jan/2009 - <ul>
+        <li><a href="newsarchive.html#01052009"><strong>Apache Mailet 2.4</strong> released</a></li>
+        </ul>
+        </li>
+      </ul>
+      <i>Read all the news in full in the <a href="newsarchive.html">News Archive</a></i><br/>
     </subsection>
     <br />
        <iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="250" height="150"></iframe>
@@ -25,7 +59,8 @@
    </div>
     <section name="What is JAMES?">
       <p>
-The Apache JAMES Project delivers a rich set of open source solutions, written in Java, related to internet mail and news.
+The Apache JAMES Project delivers a rich set of open source modules and libraries, written in Java, 
+related to internet mail and news which build into an advanced enterprise mail server.
       </p>
       <subsection name='Get Involved'>
 <p>
@@ -42,16 +77,27 @@
 </ul>
   </subsection>
 </section>
-  <section name='Products'>
+  <section name='Looking For...'>
+    <subsection name='An Enterprise Mail Server'>
       <p>
-The JAMES project contains many products, classified by subproject: 
+      <a href='http://james.apache.org/server'>James Server</a> is a stable, mature and production ready email server.
+      </p>
+    </subsection>
+    <subsection name='A Modular Mail Platform'>
+      <p>
+      Developers looking for a modular mail platform on which to build should start by 
+      looking at the modules and libraries used to compose James Server 3.x.
       </p>
 <ul>
-<li><a href='http://james.apache.org/server'>JAMES Server</a> is an advanced fully functioned 
-integrated mail server. It is a mailet container and delegates mail processing to mailets
-(independent processing agents). Most of these mailets are 
-available through products in the <a href='http://james.apache.org/mailets'>mailets subproject</a>.
-The following protocols are supported:
+<li><a href='http://james.apache.org/server/head/index.html'>JAMES Server 3</a>
+<ul>
+<li>Is an advanced fully functioned integrated mail server</li>
+<li>Is a mailet container, delegating to independent processing agents known as mailets</li>
+<li>Is modular</li>
+<li>Supports Spring and is moving towards OSGi</li>
+<li>Retains the mature, production ready <a href='http://excalibur.apache.org'>Apache Excalibur</a>
+components used by <a href='http://avalon.apache.org'>Avalon</a></li>
+<li>Supports the following protocols:
 <ul>
 <li><a href='http://james.apache.org/server/rfclist/smtp/rfc0821.txt'>
 <abbr title='Simple Mail Transport Protocol'>SMTP</abbr></a></li>
@@ -60,7 +106,10 @@
 <li><a href='http://james.apache.org/server/rfclist/pop3/rfc1725.txt'>
 <abbr title='Post Office Protocol'>POP3</abbr></a></li>
 <li><a href='http://james.apache.org/server/rfclist/imap4/rfc2060.txt'>
-<abbr title='Internet Message Access Protocol'>IMAP</abbr></a> (experimental)</li>
+<abbr title='Internet Message Access Protocol'>IMAP</abbr></a> 
+(see the <a href='http://james.apache.org/imap'>IMAP</a> sub-project)</li>
+</ul>
+</li>
 </ul>
 </li>
 <li>The <a href='http://james.apache.org/mailets'>Mailet subproject</a> collects products
@@ -79,13 +128,18 @@
 </li>
 <li><a href='http://james.apache.org/jspf/'>jSPF</a> implements <abbr title='Sender Policy Framework'>
 <a href='http://www.openspf.org/'>SPF</a></abbr></li>
+<li><a href='http://james.apache.org/jdkim/'>jDKIM</a> implements <abbr title='Domain Keys Identified Mail'>
+<a href='http://www.dkim.org/'>DKIM</a></abbr></li>
 <li><a href='http://james.apache.org/mime4j/'>Mime4J</a> parses MIME typed documents (including 
 - but not limited to - mail). APIs similar to DOM, SAX and pull parsers are exposed.</li>
 <li><a href='http://james.apache.org/jsieve'>jSieve</a> implements the 
 <a href='http://www.ietf.org/rfc/rfc3028.txt'>Sieve</a> mail filtering language</li>
 <li><a href='http://james.apache.org/postage/'>Postage</a> generates mail traffic suitable
 for stress testing mail servers</li>
+<li><a href='http://james.apache.org/mpt/'>MPT</a> is a scripted functional test tool
+suitable for testing mail protocols.</li>
 </ul>
-    </section>
+    </subsection>
+  </section>
   </body>
 </document>
diff --git a/project/src/site/xdoc/license.xml b/project/src/site/xdoc/license.xml
index 06475cf..edb43ec 100644
--- a/project/src/site/xdoc/license.xml
+++ b/project/src/site/xdoc/license.xml
@@ -3,15 +3,16 @@
 <document>
 
  <properties>
-  <title>Apache Software License</title>
+  <title>Apache License</title>
   <author email="sergek@lokitech.com">Serge Knystautas</author>
  </properties>
 
 <body>
-<section name="Apache Software License">
+<section name="Apache License">
 <p>
-    James is released under the Apache Software License
-    listed below:
+    Apache James is Open Source released under the <a href='http://www.opensource.org/'>OSI</a>
+    <a href='http://www.opensource.org/licenses/apache2.0.php'>approved</a>
+    <a href='http://www.apache.org/licenses/'>Apache License, Version 2.0</a>
 </p>
 
 <source><![CDATA[
@@ -197,12 +198,17 @@
 
 </section>
 
-<section name="dnsjava">
-<p>
-    dnsjava is distributed with James, a copy of the licence is contained in the distribution
-</p>
+<section name='Third Party Libraries'>
+  <p>
+Apache James relies on numerous third party libraries. Each is distributed under it's individual 
+license terms.
+  </p>
+  <subsection name="dnsjava">
+  <p>
+      dnsjava is distributed with James, a copy of the licence is contained in the distribution
+  </p>
+  </subsection>
 </section>
-
 </body>
 </document>
 
diff --git a/project/src/site/xdoc/mail.xml b/project/src/site/xdoc/mail.xml
index deb8aa4..2b01cdd 100644
--- a/project/src/site/xdoc/mail.xml
+++ b/project/src/site/xdoc/mail.xml
@@ -135,6 +135,32 @@
 messages to multiple mailing lists. The reason is that people may be 
 subscribed to one list and not to the other. Therefore, some people will 
 only see part of the conversation. </p>
+	<subsection name="How to unsubscribe your old email address">
+        <p>
+        First, find out the particular email adress to which ezmlm is sending.
+        The email headers are visible in Microsoft Outlook via the messages menu
+        "View | Options".
+        </p>
+        <pre>
+        Microsoft Mail Internet Headers Version 2.0
+        ...
+        List-Unsubscribe: &lt;mailto:server-user-unsubscribe@james.apache.org&gt;
+        List-Help: &lt;mailto:server-user-help@james.apache.org&gt;
+        List-Post: &lt;mailto:server-user@james.apache.org&gt;
+        List-Id: "James Server Users List" &lt;server-user.james.apache.org&gt;
+        Reply-To: "James Server Users List" &lt;server-user@james.apache.org&gt;
+        Delivered-To: mailing list server-user@james.apache.org
+        ...
+        Return-Path: server-user-return-12345-<i>john=host.domain</i>@james.apache.org
+        ...
+        </pre>
+        <p>
+        The <i>Return-Path</i> header contains the email address which is subscribed. 
+        </p>      
+        <p> To stop subscription for the address john@host.domain , send an email to <pre>server-dev-unsubscribe-john=host.domain@james.apache.org</pre>
+          or to  <pre>server-user-unsubscribe-john=host.domain@james.apache.org</pre>.
+        </p>  
+      </subsection>
     </section>
     <section name="Archives">
       <p> There are several sites on the net that archive and 
@@ -203,6 +229,18 @@
 mail to this list with usage questions or configuration problems</b> -- 
 that's what server-user@james is for. </p>
       </subsection>
+      <subsection name="Mime4j">
+        <p>
+          <b>Medium Traffic</b>
+          <a href="mailto:mime4j-dev-subscribe@james.apache.org">Subscribe</a>
+          <a href="mailto:mime4j-dev-unsubscribe@james.apache.org">Unsubscribe</a>
+          <a href="mail.html">Guidelines</a>
+          <a href="http://mail-archives.apache.org/mod_mbox/james-mime4j-dev"> 
+Archive</a>
+        </p>
+        <p> Discussions on the <a href='http://james.apache.org/mime4j'>Mime4j</a> 
+        parser library.</p>
+      </subsection>
       <subsection name="Site Developer List">
         <p>
           <b>Very Low Traffic</b>
@@ -244,5 +282,6 @@
         <p> This is the public list for the Mailet API subproject, discussing all <a href="http://james.apache.org/mailet/index.html">Mailet API</a> design and implementation related topics. Questions about using Mailets and their configuration should be addressed to the server-user list.</p>
       </subsection>
     </section>
+	
   </body>
 </document>
diff --git a/project/src/site/xdoc/newsarchive.xml b/project/src/site/xdoc/newsarchive.xml
index ec21e44..1527ba9 100644
--- a/project/src/site/xdoc/newsarchive.xml
+++ b/project/src/site/xdoc/newsarchive.xml
@@ -11,6 +11,90 @@
             <iframe src="http://www.apache.org/ads/bannerbar.html" style="border-width:0;" frameborder="0" scrolling="no" width="250" height="150"></iframe>
           </div>
         </div>
+    <subsection name='2009'>
+        <a name='15102009'><h4>Oct/2009 - jDKIM joins Apache James as sub-project</h4></a>
+        <p>
+        The Apache JAMES project is pleased to announce the inclusion of a new sub-project called
+        <a href='http://james.apache.org/jdkim/'>jDKIM</a>.
+        jDKIM is a DomainKeys Identified Mail (DKIM) implementation library written in Java. It provides both verification and signing and also provides Mailets for the Apache JAMES project.
+        </p> 
+        
+        <a name='25092009'><h4>Sep/2009 - Hupa joins Apache James as sub-project</h4></a>
+        <p>
+        The Apache JAMES project is pleased to announce the inclusion of a new sub-project called
+        <a href='http://james.apache.org/hupa/'>Hupa</a>.
+        Hupa is a GWT based webmail which use IMAP to connect to the backend mailserver.
+        </p> 
+        
+        <a name='31082009'><h4>Aug/2009 - Apache James 2.3.2 Released</h4></a>
+        <p>
+        The Apache JAMES project is pleased to announce that Apache James 2.3.2 
+        is now 
+        <a href='download.cgi#Apache_James_Server'>available</a>.
+        This is a minor bug fix release.
+        See the 
+        <a href="http://james.apache.org/server/2.3.2/release-notes.html">Release Notes</a> 
+        for more details. Upgrading is recommended for users of previous 2.x releases.
+        </p> 
+        <a name="02072009"><h4>Jul/2009 - Apache MPT 0.1 released</h4></a>
+        <p>The Apache JAMES project is pleased to announced that the first release of
+        <a href='http://james.apache.org/mpt'>Apache MPT</a> - a functional testing
+        library particularly suitable for line protocols based on ASCII - is now
+        <a href='download.cgi#Apache_MPT'>available</a>. These
+        protocols are common in mail but the library may be useful more widely.
+        See the <a href='http://james.apache.org/mpt/0.1/release-notes.html'>release notes</a>
+        for more details.
+        </p>
+        <a name="25062009"><h4>Jun/2009 - Apache jSPF 0.9.7 released</h4></a>
+        <p>The Apache JAMES Project is pleased to announce a new  
+        <a href='http://james.apache.org/jspf'>Apache jSPF</a> release which included some critical bug fixes.
+        </p> 
+        <a name="18062009"><h4>Jun/2009 - Apache JSieve 0.3 released</h4></a>
+        <p>The Apache JAMES Project is pleased to announce that the third release of
+        <a href='http://james.apache.org/jsieve'>Apache JSieve</a> - an implementation of the
+        <a href='http://www.ietf.org/rfc/rfc3028.txt'>Sieve</a> mail filtering language - 
+        is now available for <a href='download.cgi#Apache_JSieve'>download</a>. This is the first
+        modular release and includes a filtering <a href='http://james.apache.org/mailet'>mailet</a>.
+        See the <a href='http://james.apache.org/jsieve/0.3/release-notes.html'>release notes</a>
+        for more details.
+        </p> 
+        <a name="14052009"><h4>May/2009 - Apache Crypto Mailets 1.0 released</h4></a>
+        <p>The Apache JAMES Project is pleased to announce the first independent release of
+        <a href='http://james.apache.org/mailet/crypto'>Apache Cryptographic Mailets</a> (previous versions 
+        were released as part of the 
+        <a href='http://james.apache.org/server'>Apache James Server</a>). 
+        This package contains mailets which encode, decode, sign and verify mail plus cryptology utilities.
+        </p> 
+        <a name="01042009"><h4>Apr/2009 - Apache Mailet Base 1.0 released</h4></a>
+        <p>The Apache JAMES Project is pleased to announce the first independent release of
+        <a href='http://james.apache.org/mailet/base'>Apache Mailet Base</a> (previous versions 
+        were released as part of the 
+        <a href='http://james.apache.org/server'>Apache James Server</a>). The Basic Mailet Toolkit
+        contains lightweight frameworks and utilities likely to be of interest to 
+        <a href='http://james.apache.org/mailet/api'>Mailet</a> developers.
+        </p>   
+        <a name="08032009"><h4>Mar/2009 - Mime4j 0.6 released</h4></a>
+        <p>We are proud to announce the <a href="../download.cgi">availability</a> of Apache 
+        Mime4j-0.6. This release brings another round of API enhancements and performance 
+        optimizations. There has been a number of notable improvements in the DOM support. MIME 
+        stream parser is expected to be 50% faster when line counting is disabled. Please also note 
+        that as of this release Mime4j requires a Java 1.5 compatible runtime</p>
+        <a name="21022009"><h4>Feb/2009 - MailetDocs Maven Plugin 0.1 released</h4></a>
+        <p>The Apache JAMES Project is pleased to announce the first release of the
+        <a href='http://james.apache.org/mailet/maven-mailetdocs-plugin/' rel='tag'>MailetDocs</a> 
+        plugin for <a href='http://maven.apache.org' rel='tag'>Maven</a>. The plugin catalogs mailet
+        (for <a href='http://james.apache.org/mailet/standard/mailet-report.html'>example</a>). 
+        For more information, see the 
+        <a href='http://james.apache.org/mailet/maven-mailetdocs-plugin/release-notes.html'>release notes</a>.
+        </p>  
+        <a name="01052009"><h4>Jan/2009 - Apache Mailet 2.4 released</h4></a>
+        <p>The Apache JAMES Project is pleased to announce the first independent release of
+        <a href='http://james.apache.org/mailet/api'>Apache Mailet</a> (previous versions 
+        were released as part of the 
+        <a href='http://james.apache.org/server'>Apache James Server</a>). The Mailet API
+        defines a standard approach to enterprise mail processing.
+        </p>   
+    </subsection>
     <subsection name="2008">
         <a name="10162008"><h4>October/2008 - Mime4j 0.5 released</h4></a>
         <p>We are proud to announce the <a href="../download.cgi">availability</a> of APACHE Mime4j-0.5. This release addresses a number of important issues discovered since 0.4. In particular, it improves Mime4j ability to deal with malformed data streams including those intentionally crafted to cause excessive CPU and memory utilization that can lead to DoS condition</p>
@@ -45,7 +129,7 @@
     
     <subsection name="2007">
         <a name="09252007"><h4>Sept/2007 - jSPF-0.9.5 released</h4></a>
-        <p>We are proud to announce the <a href="downloadunstable.cgi">availability</a> of APACHE jSPF-0.9.5. This release brings initial support for asynchronous processing and is fully RFC4408 compliant.</p> 
+        <p>We are proud to announce the <a href="download.cgi">availability</a> of APACHE jSPF-0.9.5. This release brings initial support for asynchronous processing and is fully RFC4408 compliant.</p> 
         <a name="05302007"><h4>May/2007 - Apache Mime4J 0.3 Final Released</h4></a>
         <p>After almost 2 years the Apache JAMES team is proud to announce the <a href="download.cgi">availability</a> of Apache Mime4J 0.3. This is the first release under the ASF umbrella.</p>
         <a name="05052007"><h4>May/2007 - Mailet API sub-project lives</h4></a>
diff --git a/project/src/site/xdoc/weare.xml b/project/src/site/xdoc/weare.xml
index d7a8abd..60ea955 100644
--- a/project/src/site/xdoc/weare.xml
+++ b/project/src/site/xdoc/weare.xml
@@ -64,7 +64,15 @@
       <p>
         <b>Robert Burrell Donkin (rdonkin at apache.org) [RBD]</b>
       </p>
-      
+      <p>
+        <b>Markus Wiederkehr (mwiederkehr at apache.org)</b>
+      </p>
+      <p>
+        <b>Oleg Kalnichevski (olegk at apache.org)</b>
+      </p>
+      <p>
+        <b>Manuel Carrasco Monino (manolo at apache.org)</b>
+      </p>
     </section>
     <section name="Alumni and Other Contributors">
     <p>Many people have had a hand in James' success over the years, here we'd like to give credit to those who have made a difference and to those who have left.</p>
diff --git a/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar b/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar
deleted file mode 100644
index 48697b5..0000000
--- a/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom b/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom
deleted file mode 100644
index 54e367a..0000000
--- a/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <parent>
-    <artifactId>maven-skins</artifactId>
-    <groupId>org.apache.maven.skins</groupId>
-    <version>2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.skins</groupId>
-  <artifactId>maven-default-skin</artifactId>
-  <name>Maven Default Skin</name>
-  <version>1.0</version>
-  <description>Maven Default Skin</description>
-  <url>http://maven.apache.org/skins/maven-default-skin</url>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/MNG</url>
-  </issueManagement>
-  <ciManagement>
-    <system>continuum</system>
-    <url>http://maven.zones.apache.org:8080/continuum</url>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>notifications@maven.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2002</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Maven Announcements List</name>
-      <subscribe>announce-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
-      <post>announce@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Maven Issues List</name>
-      <subscribe>issues-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
-      <post>issues@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Maven Notifications List</name>
-      <subscribe>notifications-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>notifications-unsubscribe@maven.apache.org</unsubscribe>
-      <post>notifications@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>jvanzyl</id>
-      <name>Jason van Zyl</name>
-      <email>jason@maven.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Chair</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>brett</id>
-      <name>Brett Porter</name>
-      <email>brett@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+10</timezone>
-    </developer>
-    <developer>
-      <id>evenisse</id>
-      <name>Emmanuel Venisse</name>
-      <email>evenisse@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>kenney</id>
-      <name>Kenney Westerhof</name>
-      <email>kenney@apache.org</email>
-      <organization>Neonics</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>snicoll</id>
-      <name>Stephane Nicoll</name>
-      <email>snicoll@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>vmassol</id>
-      <name>Vincent Massol</name>
-      <email>vmassol@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>fgiust</id>
-      <name>Fabrizio Giustina</name>
-      <email>fgiust@apache.org</email>
-      <organization>openmind</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>epunzalan</id>
-      <name>Edwin Punzalan</name>
-      <email>epunzalan@mergere.com</email>
-      <organization>Mergere</organization>
-      <roles>
-        <role>Committer</role>
-      </roles>
-      <timezone>+8</timezone>
-    </developer>
-    <developer>
-      <id>mperham</id>
-      <name>Mike Perham</name>
-      <email>mperham@gmail.com</email>
-      <organization>Webify Solutions</organization>
-      <roles>
-        <role>Committer</role>
-      </roles>
-      <timezone>-6</timezone>
-    </developer>
-    <developer>
-      <id>jdcasey</id>
-      <name>John Casey</name>
-      <email>jdcasey@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>trygvis</id>
-      <name>Trygve Laugstol</name>
-      <email>trygvis@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>vsiveton</id>
-      <name>Vincent Siveton</name>
-      <email>vsiveton@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>Committer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-  </developers>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-default-skin</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-default-skin</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/skins/trunk/maven-default-skin</url>
-  </scm>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-  <build>
-    <sourceDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\main\java</sourceDirectory>
-    <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
-    <testSourceDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\test\java</testSourceDirectory>
-    <outputDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target\classes</outputDirectory>
-    <testOutputDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target\test-classes</testOutputDirectory>
-    <resources>
-      <resource>
-        <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\main\resources</directory>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\test\resources</directory>
-      </testResource>
-    </testResources>
-    <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target</directory>
-    <finalName>maven-default-skin-1.0</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/maven/skins/tags</tagBase>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.2</version>
-        <inherited>true</inherited>
-        <configuration>
-          <updateReleaseInfo>true</updateReleaseInfo>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.0-beta-3</version>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.0.1</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.2-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-    </plugins>
-  </build>
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://svn.apache.org/maven-snapshot-repository</url>
-    </repository>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>Maven Repository Switchboard</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <releases>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>Maven Plugin Repository</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <reporting>
-    <outputDirectory>target/site</outputDirectory>
-  </reporting>
-  <distributionManagement>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>scp://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>scp://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
-    </snapshotRepository>
-    <site>
-      <id>website</id>
-      <url>scp://minotaur.apache.org/www/maven.apache.org/skins/maven-default-skin</url>
-    </site>
-  </distributionManagement>
-</project>
\ No newline at end of file