diff --git a/build-spring-framework/publish-documentation.xml b/build-spring-framework/publish-documentation.xml
index cacbd3694a3..1d81cf14a65 100644
--- a/build-spring-framework/publish-documentation.xml
+++ b/build-spring-framework/publish-documentation.xml
@@ -3,7 +3,9 @@
 
 <!-- Main targets -->
 	<target name="publish-documentation" depends="publish-documentation.init">
-		<sshexec host="spring02.managed.contegix.com" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+		<sshexec host="static.springframework.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+				command="rm -rf /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"/>
+		<sshexec host="static.springframework.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
 				command="mkdir /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"/>
 
 		<scp remoteToDir="${username}@spring02.managed.contegix.com:/opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version}"
@@ -16,8 +18,8 @@
 			<fileset dir="${package.docs.dir}" />
 		</scp>
 
-		<sshexec host="spring02.managed.contegix.com" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
-				command="rm /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.0.x ; ln -s /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version} /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.0.x"/>
+		<sshexec host="static.springframework.org" username="${username}" keyfile="${key.file}" passphrase="${passphrase}"
+				command="rm -f /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.1.x ; ln -s /opt/www/domains/springframework.org/www/htdocs/spring/docs/${bundle.version} /opt/www/domains/springframework.org/www/htdocs/spring/docs/3.1.x"/>
 	</target>
 
 <!-- Other targets -->
diff --git a/build.properties b/build.properties
index 5f5f4b6ebf2..10f00be6b6f 100644
--- a/build.properties
+++ b/build.properties
@@ -13,7 +13,7 @@ ivy.cache.dir=${basedir}/../ivy-cache
 integration.repo.dir=${basedir}/../integration-repo
 license.dir=${basedir}/../build-spring-framework/resources
 javadoc.exclude.package.names=org/springframework/samples/**
-javadoc.max.memory=256M
+javadoc.max.memory=1024M
 test.vm.args=-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError
 compiler.args=-enableJavadoc -warn:none