diff --git a/parent/pom.xml b/parent/pom.xml
index 88a4c320..856969cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,6 +84,14 @@
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>2.3</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.5</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>3.0</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-release-plugin</artifactId>
                     <version>2.2.1</version>
@@ -128,6 +136,11 @@
                     <artifactId>xmlbeans-maven-plugin</artifactId>
                     <version>2.3.3</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.agilejava.docbkx</groupId>
+                    <artifactId>docbkx-maven-plugin</artifactId>
+                    <version>2.0.13</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -141,6 +154,16 @@
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <dependencies>
+                  <dependency>
+                    <groupId>org.apache.maven.wagon</groupId>
+                    <artifactId>wagon-ssh</artifactId>
+                    <version>1.0-beta-7</version>
+                  </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
     <reporting>
diff --git a/pom.xml b/pom.xml
index dd6f1a45..cac48bb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,11 +145,29 @@
         </profile>
     </profiles>
     <build>
+        <extensions>
+            <extension>
+                <groupId>org.springframework.build.aws</groupId>
+                <artifactId>org.springframework.build.aws.maven</artifactId>
+                <version>3.1.0.RELEASE</version>
+            </extension>
+        </extensions>
         <plugins>
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>
                 <version>2.2.1</version>
             </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.0</version>
+                <dependencies>
+                  <dependency>
+                    <groupId>org.apache.maven.wagon</groupId>
+                    <artifactId>wagon-ssh</artifactId>
+                    <version>1.0-beta-7</version>
+                  </dependency>
+                </dependencies>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2-beta-5</version>
@@ -212,7 +230,7 @@
             <plugin>
                 <groupId>com.agilejava.docbkx</groupId>
                 <artifactId>docbkx-maven-plugin</artifactId>
-                <version>2.0.11</version>
+                <version>2.0.13</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/samples/pom.xml b/samples/pom.xml
index 6783283e..b2e91e9d 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -45,6 +45,12 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
             </plugin>
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index 1477c835..c20d1c00 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -6,10 +6,10 @@ Downloads
 
 * Get the latest Spring Web Services releases here
 
-	* <<Spring-WS 2.0.1.RELEASE is the current production release (JDK 1.5+)>>
+	* <<Spring-WS 2.0.4.RELEASE is the current production release (JDK 1.5+)>>
 
-	* {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/2.0.1.RELEASE/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=106405}Announcement}}
+	* {{{http://www.springsource.com/download/community?project=Spring%20Web%20Services}Download}} | {{{http://static.springframework.org/spring-ws/docs/2.0.4.RELEASE/changelog.txt}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=122440}Announcement}}
 
-	* <<Spring-WS 2.0.2 is the upcoming production release>>
+	* <<Spring-WS 2.0.5 is the upcoming production release>>
 
 		* {{{snapshots.html}Download nightly snapshots}}
diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt
index 772dccc5..510f3630 100644
--- a/src/site/apt/downloads/snapshots.apt
+++ b/src/site/apt/downloads/snapshots.apt
@@ -23,7 +23,7 @@ Snapshot Builds
 <dependency>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-core</artifactId>
-    <version>2.0.2.RELEASE-SNAPSHOT</version>
+    <version>2.0.5.RELEASE-SNAPSHOT</version>
 </dependency>
 +---------------