diff --git a/pom.xml b/pom.xml
index 8c986046..7c27e7c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -647,7 +647,7 @@
 									<goals>
 										<goal>single</goal>
 									</goals>
-									<phase>package</phase>
+									<phase>prepare-package</phase>
 									<configuration>
 										<descriptors>
 											<descriptor>${shared.resources}/assemblies/static-resources.xml</descriptor>
@@ -656,34 +656,20 @@
 										<appendAssemblyId>false</appendAssemblyId>
 									</configuration>
 								</execution>
-							</executions>
-						</plugin>
-
-						<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>wagon-maven-plugin</artifactId>
-							<configuration>
-								<fromDir>${project.build.directory}</fromDir>
-							</configuration>
-							<executions>
-
-								<!-- Distribute static resources -->
-
 								<execution>
-									<id>upload-static-resources</id>
-									<phase>deploy</phase>
+									<id>docs</id>
 									<goals>
-										<goal>upload</goal>
+										<goal>single</goal>
 									</goals>
+									<phase>package</phase>
 									<configuration>
-										<fromDir>${project.build.directory}/static-resources</fromDir>
-										<includes>**</includes>
-										<serverId>static-dot-s2</serverId>
-										<url>scp://static.springsource.org</url>
-										<toDir>
-											/var/www/domains/springsource.org/www/htdocs/autorepo/docs/${dist.id}/${project.version}
-										</toDir>
-										<optimize>true</optimize>
+										<descriptors>
+											<descriptor>src/assembly/docs.xml</descriptor>
+										</descriptors>
+										<finalName>spring-vault-${project.version}-docs</finalName>
+										<appendAssemblyId>false</appendAssemblyId>
+										<classifier>docs</classifier>
+										<attach>true</attach>
 									</configuration>
 								</execution>
 							</executions>
@@ -694,12 +680,29 @@
 							<artifactId>maven-deploy-plugin</artifactId>
 							<configuration>
 								<skip>true</skip>
+								<uniqueVersion>false</uniqueVersion>
 							</configuration>
 						</plugin>
-
 					</plugins>
 				</pluginManagement>
 			</build>
+
+			<repositories>
+				<repository>
+					<id>spring-libs-snapshot</id>
+					<url>https://repo.spring.io/libs-snapshot</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+
+			<pluginRepositories>
+				<pluginRepository>
+					<id>spring-plugins-release</id>
+					<url>https://repo.spring.io/plugins-release</url>
+				</pluginRepository>
+			</pluginRepositories>
 		</profile>
 	</profiles>
 </project>
\ No newline at end of file
diff --git a/spring-vault-distribution/src/assembly/docs.xml b/spring-vault-distribution/src/assembly/docs.xml
new file mode 100644
index 00000000..e15a120f
--- /dev/null
+++ b/spring-vault-distribution/src/assembly/docs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+	<id>docs</id>
+	<formats>
+		<format>dir</format>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<!--
+				Adds reference manual (html and pdf) to the distribution archive
+				under the 'docs/reference' directory see pom.xml 'maven-javadoc-plugin' declaration.
+			-->
+			<directory>${project.root}/target/site/reference</directory>
+			<outputDirectory>reference</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<!--
+				Adds javadoc html to the distribution archive under the 'docs/javadoc'
+				directory see pom.xml 'maven-javadoc-plugin' declaration.
+			-->
+			<directory>${project.root}/target/site/apidocs</directory>
+			<outputDirectory>api</outputDirectory>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file