diff --git a/README.md b/README.md
index 434d8c20..c87df129 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,17 @@ This project provides support for using Spring and Java with AMQP, and in partic
 
 # Getting Started
 
-Clone from GIT and then use Maven (2.1.*):
+Clone from GIT and then use Maven (2.2.*):
 
     $ git clone ...
-    $ mvn install
+    $ mvn install -P bootstrap
+
+Use the `bootstrap` profile only the first time - it enables some
+repositories that can't be exposed in the poms by default.
 
 SpringSource ToolSuite users (or Eclipse users with the latest
 m2eclipse plugin) can import the projects as existing Eclipse
-projects. There are plenty of intersting integration tests (names
+projects. There are plenty of intersteing integration tests (names
 ending with `IntegrationTests`) to show the features of the
 framework. Sample applications can be found in the [Spring AMQP
 Samples](http://github.com/SpringSource/spring-amqp-samples) project.
diff --git a/pom.xml b/pom.xml
index 6904ea42..419b2979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,103 @@
 			  </repository>
 			</distributionManagement>
 		</profile>
+		<profile>
+			<id>milestone</id>
+			<distributionManagement>
+			  <repository>
+				<id>spring-milestone</id>
+				<name>Spring Milestone Repository</name>
+				<url>s3://maven.springframework.org/milestone</url>
+			  </repository>
+			</distributionManagement>
+		</profile>
+		<profile>
+			<id>upload</id>
+			<build>
+			  <plugins>
+				<plugin>
+				  <groupId>com.agilejava.docbkx</groupId>
+				  <artifactId>docbkx-maven-plugin</artifactId>
+				  <executions>
+					<execution>
+					  <goals>
+						<goal>generate-html</goal>
+						<goal>generate-pdf</goal>
+					  </goals>
+					  <phase>package</phase>
+					</execution>
+				  </executions>
+				</plugin>
+				<plugin>
+				  <artifactId>maven-javadoc-plugin</artifactId>
+				  <executions>
+					<execution>
+						<id>aggregate</id>
+						<goals>
+							<goal>aggregate</goal>
+						</goals>
+					  <phase>package</phase>
+					</execution>
+				  </executions>
+				</plugin>
+				<plugin><!--
+						   run `mvn package assembly:assembly` to trigger assembly creation.
+						   see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
+				  <artifactId>maven-assembly-plugin</artifactId>
+				  <version>2.2-beta-5</version>
+				  <inherited>false</inherited>
+				  <executions>
+					<execution>
+					  <id>distribution</id>
+					  <goals>
+						<goal>single</goal>
+					  </goals>
+					  <phase>package</phase>
+					  <configuration>
+						<descriptors>
+						  <descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
+						</descriptors>
+						<appendAssemblyId>false</appendAssemblyId>
+					  </configuration>
+					</execution>
+				  </executions>
+				</plugin>
+				<plugin>
+				  <groupId>org.apache.maven.plugins</groupId>
+				  <artifactId>maven-antrun-plugin</artifactId>
+				  <version>1.4</version>
+				  <executions>
+					<execution>
+					  <id>upload-dist</id>
+					  <phase>deploy</phase>
+					  <goals>
+						<goal>run</goal>
+					  </goals>
+					</execution>
+				  </executions>
+				  <configuration>
+					<tasks>
+					  <ant antfile="${basedir}/src/ant/upload-dist.xml">
+						<target name="upload-dist" />
+					  </ant>
+					</tasks>
+				  </configuration>
+				  <dependencies>
+					<dependency>
+					  <groupId>org.springframework.build</groupId>
+					  <artifactId>org.springframework.build.aws.ant</artifactId>
+					  <version>3.0.5.RELEASE</version>
+					</dependency>
+					<dependency>
+					  <groupId>net.java.dev.jets3t</groupId>
+					  <artifactId>jets3t</artifactId>
+					  <version>0.7.2</version>
+					</dependency>
+				  </dependencies>
+				</plugin>
+			  </plugins>
+			</build>
+		</profile>
 	</profiles>
 	<scm>
 		<url>http://github.com/SpringSource/spring-amqp</url>
@@ -78,9 +175,9 @@
 			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-amqp/docs/${project.version}</url>
 		</site>
 		<repository>
-			<id>spring-milestone</id>
-			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/milestone</url>
+			<id>spring-release</id>
+			<name>Spring Release Repository</name>
+			<url>s3://maven.springframework.org/release</url>
 		</repository>
 		<snapshotRepository>
 			<id>spring-snapshot</id>
@@ -97,20 +194,12 @@
 				<version>3.0.0.RELEASE</version>
 			</extension>
 		</extensions>
-		<plugins>
+		<pluginManagement>
+		  <plugins>
 			<plugin>
 				<groupId>com.agilejava.docbkx</groupId>
 				<artifactId>docbkx-maven-plugin</artifactId>
 				<version>2.0.6</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>generate-html</goal>
-							<goal>generate-pdf</goal>
-						</goals>
-						<phase>site</phase>
-					</execution>
-				</executions>
 				<dependencies>
 					<dependency>
 						<groupId>org.docbook</groupId>
@@ -160,123 +249,65 @@
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.5</version>
+				<configuration>
+				  <aggregate>true</aggregate>
+				  <breakiterator>true</breakiterator>
+				  <header>Spring AMQP</header>
+				  <source>1.5</source>
+				  <quiet>true</quiet>
+				  <javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
+				  <overview>${project.basedir}/src/main/javadoc/overview.html</overview>
+				  <stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
+				  <!-- copies doc-files subdirectory which contains image resources -->
+				  <docfilessubdirs>true</docfilessubdirs>
+				  <groups>
+					<group>
+					  <title>Spring AMQP</title>
+					  <packages>org.springframework.amqp:org.springframework.amqp.*</packages>
+					</group>
+					<group>
+					  <title>Spring Rabbit</title>
+					  <packages>org.springframework.amqp.rabbit.*</packages>
+					</group>
+					<group>
+					  <title>Spring Erlang</title>
+					  <packages>org.springframework.erlang:org.springframework.erlang.*:org.springframework.util.exec</packages>
+					</group>
+				  </groups>
+				  <excludePackageNames>org.springframework.amqp.samples</excludePackageNames>
+				  <links>
+					<link>http://static.springframework.org/spring/docs/3.0.5.RELEASE/javadoc-api</link>
+					<link>http://java.sun.com/javase/6/docs/api</link>
+				  </links>
+				</configuration>
+			</plugin>
+		  </plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>com.agilejava.docbkx</groupId>
+				<artifactId>docbkx-maven-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>aggregate</id>
 						<goals>
-							<goal>aggregate</goal>
+							<goal>generate-html</goal>
+							<goal>generate-pdf</goal>
 						</goals>
 						<phase>site</phase>
-						<configuration>
-							<aggregate>true</aggregate>
-							<breakiterator>true</breakiterator>
-							<header>Spring AMQP</header>
-							<source>1.5</source>
-							<quiet>true</quiet>
-							<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
-							<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
-							<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
-							<!-- copies doc-files subdirectory which contains image resources -->
-							<docfilessubdirs>true</docfilessubdirs>
-							<groups>
-								<group>
-									<title>Spring AMQP</title>
-									<packages>org.springframework.amqp:org.springframework.amqp.*</packages>
-								</group>
-								<group>
-									<title>Spring Rabbit</title>
-									<packages>org.springframework.amqp.rabbit.*</packages>
-								</group>
-								<group>
-									<title>Spring Erlang</title>
-									<packages>org.springframework.erlang:org.springframework.erlang.*:org.springframework.util.exec</packages>
-								</group>
-							</groups>
-							<excludePackageNames>org.springframework.amqp.samples</excludePackageNames>
-							<links>
-								<link>http://static.springframework.org/spring/docs/3.0.5.RELEASE/javadoc-api</link>
-								<link>http://java.sun.com/javase/6/docs/api</link>
-							</links>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-			<plugin><!--
-				run `mvn package assembly:assembly` to trigger assembly creation.
-				see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html -->
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-5</version>
-				<inherited>false</inherited>
-				<executions>
-					<execution>
-						<id>distribution</id>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<id>upload-dist</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-				  <tasks>
-					<ant antfile="${basedir}/src/ant/upload-dist.xml">
-					  <target name="upload-dist" />
-					</ant>
-				  </tasks>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.build</groupId>
-						<artifactId>org.springframework.build.aws.ant</artifactId>
-						<version>3.0.5.RELEASE</version>
-					</dependency>
-					<dependency>
-						<groupId>net.java.dev.jets3t</groupId>
-						<artifactId>jets3t</artifactId>
-						<version>0.7.2</version>
-					</dependency>
-				</dependencies>
-			</plugin>
 		</plugins>
 		<!-- the name of this project is 'spring-amqp-dist';
 			 make sure the zip file is just 'spring-amqp'. -->
 		<finalName>${dist.finalName}</finalName>
 	</build>
 	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<!-- necessary for org.springframework.build.aws.maven dependency -->
-			<id>repository.source.maven.release</id>
-			<name>SpringSource Maven Release Repository</name>
-			<url>http://repository.springsource.com/maven/bundles/release</url>
-		</repository>
+	  <repository>
+		<!-- necessary for org.springframework.build.aws.maven dependency -->
+		<id>repository.source.maven.release</id>
+		<name>SpringSource Maven Release Repository</name>
+		<url>http://repository.springsource.com/maven/bundles/release</url>
+	  </repository>
 	</repositories>
 </project>
diff --git a/release-process.md b/release-process.md
index db0ac5fc..6447f53f 100644
--- a/release-process.md
+++ b/release-process.md
@@ -87,3 +87,7 @@ your `settings.xml`.
 If you make a mistake with the jars, you can re-deploy to the Sonatype
 staging area by doing the deploy command again, but once it is
 released they are in Maven Central and they never come out again.
+
+[Sonatype]: https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide
+[Downloads]: http://static.springframework.org/downloads/nightly/release-download.php?project=BATCH
+[CommunityDownloads]: http://www.springsource.com/download/community
diff --git a/spring-amqp-parent/pom.xml b/spring-amqp-parent/pom.xml
index 6cb950ed..8d20e4a0 100644
--- a/spring-amqp-parent/pom.xml
+++ b/spring-amqp-parent/pom.xml
@@ -103,9 +103,43 @@
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
+		<profile>
+			<id>milestone</id>
+			<distributionManagement>
+			  <repository>
+				<id>spring-milestone</id>
+				<name>Spring Milestone Repository</name>
+				<url>s3://maven.springframework.org/milestone</url>
+			  </repository>
+			</distributionManagement>
+		</profile>
 		<profile>
 			<id>bootstrap</id>
-			<!-- TODO: move the repositories in here before release -->
+			<pluginRepositories>
+			  <pluginRepository>
+				<!-- necessary for bundlor and utils -->
+				<id>repository.plugin.springsource.release</id>
+				<name>SpringSource Maven Repository</name>
+				<url>http://repository.springsource.com/maven/bundles/release</url>
+			  </pluginRepository>
+			</pluginRepositories>
+			<repositories>
+			  <repository>
+				<id>repository.springframework.maven.release</id>
+				<name>Spring Framework Maven Release Repository</name>
+				<url>http://maven.springframework.org/release</url>
+			  </repository>
+			  <repository>
+				<id>repository.springframework.maven.milestone</id>
+				<name>Spring Framework Maven Milestone Repository</name>
+				<url>http://maven.springframework.org/milestone</url>
+			  </repository>
+			  <repository>
+				<id>repository.springframework.maven.snapshot</id>
+				<name>Spring Framework Maven Snapshot Repository</name>
+				<url>http://maven.springframework.org/snapshot</url>
+			  </repository>
+			</repositories>
 		</profile>
 	</profiles>
 	<distributionManagement>
@@ -118,9 +152,9 @@
 			</url>
 		</site>
 		<repository>
-			<id>spring-milestone</id>
-			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/milestone</url>
+			<id>spring-release</id>
+			<name>Spring Release Repository</name>
+			<url>s3://maven.springframework.org/release</url>
 		</repository>
 		<snapshotRepository>
 			<id>spring-snapshot</id>
@@ -375,6 +409,18 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>aggregate</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<phase>package</phase>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
@@ -395,6 +441,7 @@
 						for more info -->
 					<groupId>com.springsource.bundlor</groupId>
 					<artifactId>com.springsource.bundlor.maven</artifactId>
+					<version>1.0.0.RELEASE</version>
 					<executions>
 						<execution>
 							<id>bundlor</id>
@@ -410,31 +457,6 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-	<pluginRepositories>
-		<pluginRepository>
-			<!-- necessary for bundlor and utils -->
-			<id>repository.plugin.springsource.release</id>
-			<name>SpringSource Maven Repository</name>
-			<url>http://repository.springsource.com/maven/bundles/release</url>
-		</pluginRepository>
-	</pluginRepositories>
-	<repositories>
-		<repository>
-			<id>repository.springframework.maven.release</id>
-			<name>Spring Framework Maven Release Repository</name>
-			<url>http://maven.springframework.org/release</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.milestone</id>
-			<name>Spring Framework Maven Milestone Repository</name>
-			<url>http://maven.springframework.org/milestone</url>
-		</repository>
-		<repository>
-			<id>repository.springframework.maven.snapshot</id>
-			<name>Spring Framework Maven Snapshot Repository</name>
-			<url>http://maven.springframework.org/snapshot</url>
-		</repository>
-	</repositories>
 	<reporting>
 		<plugins>
 			<plugin>