diff --git a/pom.xml b/pom.xml
index a6bd5f7f9..c46837705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,28 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		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>spring-batch</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0-m2-SNAPSHOT</version>
 	<name>Spring Batch</name>
 	<description>
 		<!--  Use CDATA to keep it on a single line in the manifest -->
 		<![CDATA[Spring Batch provides tools for enterprise batch or bulk processing. It can be used to wire up jobs, and track	their execution, or simply as an optimisation for repetitive processing in a transactional environment. Spring Batch is part of the Spring Portfolio.]]>
 	</description>
-	<version>1.0-m2-SNAPSHOT</version>
-	<packaging>pom</packaging>
 	<url>http://static.springframework.org/spring-batch</url>
-	<organization>
-		<name>Interface 21</name>
-		<url>http://www.interface21.com</url>
-	</organization>
-	<scm>
-		<developerConnection>scm:svn:https://svn.interface21.com/svn/i21/spring-batch/trunk</developerConnection>
-	</scm>
 	<issueManagement>
 		<system>JIRA</system>
 		<url>http://opensource.atlassian.com/projects/spring/browse/BATCH</url>
 	</issueManagement>
+	<ciManagement>
+		<system>Bamboo</system>
+		<url>http://build.springframework.org:8085/bamboo/browse/BATCH</url>
+	</ciManagement>
 	<mailingLists>
 		<mailingList>
 			<name>Spring Batch Forum</name>
@@ -36,30 +34,59 @@
 			<archive>http://lists.interface21.com/archives/spring-batch-announce</archive>
 		</mailingList>
 	</mailingLists>
-	<ciManagement>
-		<system>Bamboo</system>
-		<url>http://build.springframework.org:8085/bamboo/browse/BATCH</url>
-	</ciManagement>
+	<distributionManagement>
+		<downloadUrl>http://www.springframework.org/spring-batch</downloadUrl>
+		<repository>
+			<id>local</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</repository>
+        <snapshotRepository>
+            <id>spring-snapshot</id>
+            <name>Spring Snapshot Repository</name>
+            <url>s3://maven.springframework.org/snapshot</url>
+        </snapshotRepository>
+		<site>
+			<id>staging</id>
+			<url>file:///${user.dir}/target/staging</url>
+		</site>
+	</distributionManagement>
+	<inceptionYear>2007</inceptionYear>
+	<developers>
+		<developer>
+			<id>dsyer</id>
+			<name>Dave Syer</name>
+			<email>dsyer@interface21.com</email>
+		</developer>
+		<developer>
+			<id>lward</id>
+			<name>Lucas Ward</name>
+			<email>lucas.l.ward@accenture.com</email>
+		</developer>
+	</developers>
+	<organization>
+		<name>Interface 21</name>
+		<url>http://www.interface21.com</url>
+	</organization>
 	<licenses>
-		<license>
-			<name>Apache 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
 	</licenses>
-
-	<properties>
-		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-	</properties>
-
+	<scm>
+        <connection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk</connection>
+        <developerConnection>scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-batch/trunk</developerConnection>
+        <url>http://fisheye3.cenqua.com/browse/springframework/spring-batch/trunk</url>
+    </scm>
 	<modules>
 		<module>infrastructure</module>
 		<module>core</module>
 		<module>execution</module>
 		<module>samples</module>
 		<module>integration</module>
-		<module>docs</module> 
-  </modules>
-
+		<module>docs</module>
+	</modules>
 	<profiles>
 		<profile>
 			<id>default</id>
@@ -72,9 +99,7 @@
 			<distributionManagement>
 				<site>
 					<id>static.springframework.org</id>
-					<url>
-						scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch
-					</url>
+					<url>scp://static.springframework.org:/var/www/domains/springframework.org/static/htdocs/spring-batch</url>
 				</site>
 			</distributionManagement>
 		</profile>
@@ -100,15 +125,41 @@
 			</pluginRepositories>
 		</profile>
 	</profiles>
-
-	<distributionManagement>
-		<site>
-			<id>staging</id>
-			<url>file:///${user.dir}/target/staging</url>
-		</site>
-	</distributionManagement>
-
+	<properties>
+		<maven.test.failure.ignore>true</maven.test.failure.ignore>
+	</properties>
+	<repositories>
+		<repository>
+			<id>apache-snapshots</id>
+			<url>http://people.apache.org/maven-snapshot-repository</url>
+		</repository>
+		<repository>
+			<id>spring-snapshots</id>
+			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-snapshots</url>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring</id>
+			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>spring-ext</id>
+			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>objectstyle</id>
+			<url>http://objectstyle.org/maven2</url>
+		</pluginRepository>
+	</pluginRepositories>
 	<build>
+        <extensions>
+            <extension>
+                <groupId>org.springframework.aws</groupId>
+                <artifactId>spring-aws-maven</artifactId>
+                <version>1.1.1</version>
+            </extension>
+        </extensions>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -165,7 +216,7 @@
 									<fileset dir="amqstore"/>
 									<fileset dir="activemq-data"/>
 									<fileset dir="derby-home"/>
-								</delete>
+                				</delete>
 							</tasks>
 						</configuration>
 						<goals>
@@ -206,33 +257,6 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<repositories>
-		<repository>
-			<id>apache-snapshots</id>
-			<url>http://people.apache.org/maven-snapshot-repository</url>
-		</repository>
-		<repository>
-			<id>spring-snapshots</id>
-			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-snapshots</url>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring</id>
-			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-ext</id>
-			<url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>objectstyle</id>
-			<url>http://objectstyle.org/maven2</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 	<reporting>
 		<excludeDefaults>true</excludeDefaults>
 		<plugins>
@@ -275,18 +299,4 @@
 			</plugin>
 		</plugins>
 	</reporting>
-
-	<developers>
-		<developer>
-			<id>dsyer</id>
-			<name>Dave Syer</name>
-			<email>dsyer@interface21.com</email>
-		</developer>
-		<developer>
-			<id>lward</id>
-			<name>Lucas Ward</name>
-			<email>lucas.l.ward@accenture.com</email>
-		</developer>
-	</developers>
-
 </project>