diff --git a/pom.xml b/pom.xml
index d9f7f41e..845736fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,9 @@
 	<profiles>
 		<profile>
 			<id>staging</id>
+			<properties>
+			  <dist.staging>/${java.io.tmpdir}/spring-amqp/dist</dist.staging>
+			</properties>
 			<distributionManagement>
 				<site>
 					<id>spring-site-staging</id>
diff --git a/spring-amqp-parent/pom.xml b/spring-amqp-parent/pom.xml
index ae3ba24e..52249b84 100644
--- a/spring-amqp-parent/pom.xml
+++ b/spring-amqp-parent/pom.xml
@@ -62,7 +62,7 @@
 		<downloadUrl>http://www.springsource.com/download/community
 		</downloadUrl>
 		<site>
-			<id>spring-docs</id>
+			<id>spring-site</id>
 			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-amqp/docs/${project.version}
 			</url>
 		</site>
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerBrokerInterruptionIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerBrokerInterruptionIntegrationTests.java
index 5ade0354..bff36538 100644
--- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerBrokerInterruptionIntegrationTests.java
+++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/listener/MessageListenerBrokerInterruptionIntegrationTests.java
@@ -97,7 +97,7 @@ public class MessageListenerBrokerInterruptionIntegrationTests {
 	}
 
 	@Test
-	public void testListenerRecoversFromClosedConnection() throws Exception {
+	public void testListenerRecoversFromDeadBroker() throws Exception {
 
 		List<QueueInfo> queues = brokerAdmin.getQueues();
 		logger.info("Queues: " + queues);
diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml
index b3d6861c..2b117259 100644
--- a/src/ant/upload-dist.xml
+++ b/src/ant/upload-dist.xml
@@ -30,7 +30,8 @@ ant -f src/ant/upload-dist.xml \
         </classpath>
         -->
     </taskdef>
-    <target name="upload-dist">
+	<target name="upload-dist" depends="upload-s3,upload-staging"/>
+    <target name="upload-s3" unless="dist.staging">
         <checksum file="${dist.filePath}" algorithm="sha1"/>
         <s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
             <upload bucketName="${dist.bucketName}" file="${dist.filePath}"
@@ -45,4 +46,12 @@ ant -f src/ant/upload-dist.xml \
             </upload>
         </s3>
     </target>
+    <target name="upload-staging" if="dist.staging">
+	    <echo>Copying dist .ZIP to ${dist.staging}</echo>
+        <checksum file="${dist.filePath}" algorithm="sha1"/>
+        <copy file="${dist.filePath}.sha1"
+                    toFile="${dist.staging}/${dist.key}/${dist.fileName}.sha1"/>
+        <copy file="${dist.filePath}"
+                    toFile="${dist.staging}/${dist.key}/${dist.fileName}"/>
+    </target>
 </project>