diff --git a/archetypes/src/site/site.xml b/archetypes/src/site/site.xml
new file mode 100644
index 000000000..62ec37d46
--- /dev/null
+++ b/archetypes/src/site/site.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Spring Batch: ${project.name}">
+
+	<bannerLeft>
+		<name>Spring Batch: ${project.name}</name>
+    	<href>index.html</href>
+	</bannerLeft>
+
+	<body>
+
+		<links>
+			<item name="${project.name}" href="index.html"/>
+		</links>
+		
+		<menu ref="modules"/>
+		<menu ref="reports"/>
+	
+	</body>
+
+</project>
diff --git a/dist/pom.xml b/dist/pom.xml
index 789f30789..02d083b9f 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -16,18 +16,28 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<modules>
-		<module>../spring-batch-infrastructure</module>
-		<module>../spring-batch-core</module>
-		<module>../spring-batch-samples</module>
+		<module>..</module>
 	</modules>
+	<profiles>
+		<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>
+	</profiles>
 	<build>
-		<extensions>
-			<extension>
-				<groupId>org.springframework.aws</groupId>
-				<artifactId>spring-aws-maven</artifactId>
-				<version>1.2</version>
-			</extension>
-		</extensions>
 		<plugins>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -68,4 +78,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 4daa97944..588c340e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,8 @@
 	<packaging>pom</packaging>
 	<modules>
 		<module>spring-batch-infrastructure</module>
-		<module>spring-batch-infrastructure-tests</module>
 		<module>spring-batch-core</module>
 		<module>spring-batch-samples</module>
-		<module>spring-batch-integration</module>
 		<module>docs</module>
 		<module>archetypes</module>
 	</modules>
@@ -68,14 +66,29 @@
 			</activation>
 		</profile>
 		<profile>
-			<id>deployment</id>
+			<id>all</id>
+	<modules>
+		<module>spring-batch-infrastructure-tests</module>
+		<module>spring-batch-integration</module>
+	</modules>
+		</profile>
+		<profile>
+			<id>staging</id>
 			<distributionManagement>
-				<site>
-					<id>static.springframework.org</id>
-					<url>
-						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch/1.1.x
-					</url>
-				</site>
+		<site>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</site>
+		<repository>
+			<id>spring-milestone</id>
+			<name>Spring Milestone Repository</name>
+			<url>file:///${user.dir}/target/staging</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>file:///${user.dir}/target/staging</url>
+		</snapshotRepository>
 			</distributionManagement>
 		</profile>
 		<profile>
@@ -117,7 +130,7 @@
 						<!-- This seems to work better than the default (2008/03/19) because links on sub-module sites are not broken -->
 						<plugin>
 							<artifactId>maven-site-plugin</artifactId>
-							<version>2.0-beta-7-SNAPSHOT</version>
+							<version>2.0-beta-8-SNAPSHOT</version>
 						</plugin>
 					</plugins>
 				</pluginManagement>
@@ -197,14 +210,16 @@
 	</profiles>
 	<distributionManagement>
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
-		<site>
-			<id>staging</id>
-			<url>file:///${user.dir}/target/staging</url>
-		</site>
+				<site>
+					<id>static.springframework.org</id>
+					<url>
+						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch/1.1.x
+					</url>
+				</site>
 		<repository>
-			<id>spring-release</id>
+			<id>spring-milestone</id>
 			<name>Spring Milestone Repository</name>
-			<url>s3://maven.springframework.org/release</url>
+			<url>s3://maven.springframework.org/milestone</url>
 		</repository>
 		<snapshotRepository>
 			<id>spring-snapshot</id>
@@ -222,6 +237,10 @@
 		</extensions>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>2.0-beta-7</version>
+				</plugin>
 				<plugin>
 					<groupId>com.atlassian.maven.plugins</groupId>
 					<artifactId>maven-clover-plugin</artifactId>
@@ -623,7 +642,7 @@
 								<link>http://static.springframework.org/spring-ws/site/apidocs/</link>
 							</links>
 							<aggregate>true</aggregate>
-							<excludePackageNames>*.batch.sample,*.batch.container</excludePackageNames>
+							<excludePackageNames>*.batch.sample,*.batch.container,example</excludePackageNames>
 						</configuration>
 						<reports>
 							<report>javadoc</report>
diff --git a/src/site/site.xml b/src/site/site.xml
index 929b02023..351882b40 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="${project.name}">
   <bannerLeft>
-    <name>${project.name}</name>
+    <name>${project.name} 1.1.x</name>
     <href>http://www.springframework.org/spring-batch</href>
   </bannerLeft>
   <bannerRight>
