diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index 65009b320..c64cfde7f 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -39,6 +39,19 @@
 				</dependency>
 			</dependencies>
 		</profile>
+		<profile>
+			<id>staging</id>
+			<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</repository>
+		<snapshotRepository>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</snapshotRepository>
+			</distributionManagement>
+		</profile>
 		<profile>
 			<id>manifest</id>
 			<activation>
@@ -223,7 +236,7 @@
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
 		<site>
 			<id>staging</id>
-			<url>file:///${user.dir}/archetypes/simple-cli/target/staging</url>
+			<url>file:///${user.dir}/target/staging</url>
 		</site>
 		<repository>
 			<id>spring-milestone</id>
diff --git a/dist/pom.xml b/dist/pom.xml
index 286ebd54d..172f4b74d 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -2,7 +2,6 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.batch</groupId>
 	<artifactId>org.springframework.batch.dist</artifactId>
 	<version>2.0.0.CI-SNAPSHOT</version>
 	<name>Distribution</name>
@@ -11,6 +10,12 @@
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[Spring Batch Distribution - used to create a .zip package for distribution of the main sub modules.]]>
 	</description>
+	<parent>
+		<groupId>org.springframework.batch</groupId>
+		<artifactId>org.springframework.batch</artifactId>
+		<version>2.0.0.CI-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
 
 	<profiles>
 		<profile>
@@ -27,6 +32,32 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>prepare</id>
+	<modules>
+		<module>../spring-batch-infrastructure-tests</module>
+		<module>../spring-batch-integration</module>
+		<module>../docs</module>
+		<module>../build-central</module>
+	</modules>
+		</profile>
+		<profile>
+			<id>dist</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>verify</id>
 			<activation>
@@ -48,13 +79,10 @@
 	</profiles>
 
 	<modules>
+	  <!-- use -P prepare for the release:prepare goal, or mvn clean -->
 		<module>..</module>
 		<module>../spring-batch-samples</module>
 		<module>../archetypes</module>
-		<module>../spring-batch-infrastructure-tests</module>
-		<module>../spring-batch-integration</module>
-		<module>../docs</module>
-		<module>../build-central</module>
 	</modules>
 
 	<build>
@@ -93,16 +121,16 @@
 										<regexpmapper from="^[^/]*/(.*)$$" to="\1"
 											handledirsep="true" />
 									</unzip>
-									<fail message="Spring Batch jar files are missing.">
+									<fail message="Failed integration test of zip distro: Spring Batch jar files are missing.">
 										<condition>
 											<not>
-												<resourcecount count="9">
+												<resourcecount count="3">
 													<fileset id="fs" dir="target/it/with-dep/dist" includes="*.jar" />
 												</resourcecount>
 											</not>
 										</condition>
 									</fail>
-									<fail message="Dependency jar files are missing.">
+									<fail message="Failed integration test of zip distro: dependency jar files are missing.">
 										<condition>
 											<not>
 												<resourcecount count="1">
@@ -111,7 +139,7 @@
 											</not>
 										</condition>
 									</fail>
-									<fail message="Test dependency jar files are missing.">
+									<fail message="Failed integration test of zip distro: test dependency jar files are missing.">
 										<condition>
 											<not>
 												<resourcecount count="1">
diff --git a/pom.xml b/pom.xml
index 05f9dc600..6b5661fe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,25 +78,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>dist</id>
-			<activation>
-				<file>
-					<exists>dist.txt</exists>
-				</file>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-javadoc-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>samples</id>
 			<modules>
@@ -112,6 +93,14 @@
 					<id>staging</id>
 					<url>file:///${user.dir}/target/staging</url>
 				</site>
+		<repository>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</repository>
+		<snapshotRepository>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</snapshotRepository>
 			</distributionManagement>
 		</profile>
 		<profile>