diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index 3b745b49b..1f41c353b 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -238,14 +238,20 @@
 			</snapshots>
 		</pluginRepository>
 		<pluginRepository>
-			<id>com.springsource.repository.bundles.plugins</id>
+			<id>com.springsource.repository.bundles.milestone</id>
 			<name>SpringSource Enterprise Bundle Repository -
-				SpringSource Bundle Plugins</name>
+				SpringSource Bundle Milestones</name>
 			<url>http://repository.springsource.com/maven/bundles/milestone</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
+		<pluginRepository>
+			<id>com.springsource.repository.bundles.snapshots</id>
+			<name>SpringSource Enterprise Bundle Repository -
+				SpringSource Bundle Snapshots</name>
+			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
+		</pluginRepository>
 	</pluginRepositories>
 	<distributionManagement>
 		<downloadUrl>http://www.springframework.org/download</downloadUrl>
diff --git a/pom.xml b/pom.xml
index 7e09f92c1..0ea9fcb12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,21 +608,6 @@
 				SpringSource Bundle Snapshots</name>
 			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
 		</pluginRepository>
-		<pluginRepository>
-			<id>spring-external</id>
-			<name>Spring External Repository</name>
-			<url>http://s3.amazonaws.com/maven.springframework.org/external</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>Codehaus Snapshots</id>
-			<url>http://snapshots.repository.codehaus.org/</url>
-			<snapshots>
-				<updatePolicy>never</updatePolicy>
-			</snapshots>
-		</pluginRepository>
 		<pluginRepository>
 			<id>agilejava</id>
 			<url>http://agilejava.com/maven</url>
@@ -630,13 +615,5 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
-		<pluginRepository>
-			<id>spring-external-svn</id>
-			<name>Spring External SVN Repository</name>
-			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
 	</pluginRepositories>
 </project>
diff --git a/src/assembly/docs.xml b/src/assembly/docs.xml
index 55f3291a8..27fb0d236 100644
--- a/src/assembly/docs.xml
+++ b/src/assembly/docs.xml
@@ -9,13 +9,5 @@
 				<include>notice.txt</include>
 			</includes>
 		</fileSet>
-	 	<fileSet>
-			<directory>target</directory>
-			<outputDirectory>samples</outputDirectory>
-			<includes>
-				<include>pom.xml</include>
-			</includes>
-			<lineEnding>unix</lineEnding>
-		</fileSet>
 	</fileSets>
 </component>
diff --git a/src/assembly/no-dependencies.xml b/src/assembly/no-dependencies.xml
index dc39aa0b4..5e1bbd2f5 100644
--- a/src/assembly/no-dependencies.xml
+++ b/src/assembly/no-dependencies.xml
@@ -59,5 +59,25 @@
 				</fileSets>
 			</sources>
 		</moduleSet>
+		<moduleSet>
+			<includes>
+				<include>
+					org.springframework.batch:org.springframework.batch.parent
+				</include>
+			</includes>
+			<sources>
+				<outputDirectoryMapping>
+					samples/spring-batch-parent
+				</outputDirectoryMapping>
+				<fileSets>
+					<fileSet>
+						<excludes>
+							<exclude>bin/**</exclude>
+							<exclude>target/**</exclude>
+						</excludes>
+					</fileSet>
+				</fileSets>
+			</sources>
+		</moduleSet>
 	</moduleSets>
 </assembly>
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
index 7cb36a807..db37a2ec3 100644
--- a/src/assembly/with-dependencies.xml
+++ b/src/assembly/with-dependencies.xml
@@ -61,9 +61,6 @@
 		</moduleSet>
 		<moduleSet>
 			<includes>
-				<include>
-					org.springframework.batch:org.springframework.batch.parent
-				</include>
 				<include>
 					org.springframework.batch:org.springframework.batch.test
 				</include>
@@ -88,6 +85,26 @@
 				</fileSets>
 			</sources>
 		</moduleSet>
+		<moduleSet>
+			<includes>
+				<include>
+					org.springframework.batch:org.springframework.batch.parent
+				</include>
+			</includes>
+			<sources>
+				<outputDirectoryMapping>
+					sources/spring-batch-parent
+				</outputDirectoryMapping>
+				<fileSets>
+					<fileSet>
+						<excludes>
+							<exclude>bin/**</exclude>
+							<exclude>target/**</exclude>
+						</excludes>
+					</fileSet>
+				</fileSets>
+			</sources>
+		</moduleSet>
 		<moduleSet>
 			<includes>
 				<include>