diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index b5e3998e2..da3a3b0fa 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -4,7 +4,7 @@
   <artifactId>spring-batch-archetype</artifactId>
   <packaging>pom</packaging>
   <name>Archetypes</name>
-  <url>http://static.springframework.org/spring-batch/${artifactId}</url>
+  <url>http://docs.spring.io/spring-batch/${artifactId}</url>
   <description>Spring Batch archetypes are simple project templates containing just enough code	to get you started running a job. For more detailed examples of using particular features of the framework, look at the Spring Batch Samples project. Currently the archetypes are deployed as regular Maven projects (not archetypes), because of limitations in the archetype plugin (or our understanding of how it works). For most effective use, copy one into Eclipse and use Q4E to manage the dependencies.</description>
   <parent>
     <groupId>org.springframework.batch</groupId>
diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index 8faddf565..ac3fd45c1 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -6,7 +6,6 @@
     <version>2.2.5.BUILD-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Commandline</name>
-    <url>http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype</url>
     <description>This project is a command line batch sample from Spring Batch demonstrating a typical batch job.
         The job can be invoked via "mvn exec:java" to see the job run from the command line.
         During an "mvn package", a distribution archive in the format defined in src/main/assembly/descriptor.xml will
@@ -46,7 +45,7 @@
                         <enabled>false</enabled>
                     </snapshots>
                 </pluginRepository>
-                <pluginRepository>
+<!--                 <pluginRepository>
                     <id>com.springsource.repository.bundles.release</id>
                     <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
                     <url>http://repository.springsource.com/maven/bundles/release</url>
@@ -54,7 +53,7 @@
                         <enabled>false</enabled>
                     </snapshots>
                 </pluginRepository>
-            </pluginRepositories>
+ -->            </pluginRepositories>
         </profile>
     </profiles>
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 674c86330..627881fd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,13 +16,13 @@
 	</modules>
 	<url>http://www.springsource.org/spring-batch</url>
 	<organization>
-		<name>SpringSource</name>
-		<url>http://www.springsource.com</url>
+		<name>Pivotal</name>
+		<url>http://spring.io</url>
 	</organization>
 	<scm>
-		<url>http://github.com/SpringSource/spring-batch</url>
-		<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/SpringSource/spring-batch.git</developerConnection>
+		<url>http://github.com/spring-projects/spring-batch</url>
+		<connection>scm:git:git://github.com/spring-projects/spring-batch.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-batch.git</developerConnection>
 	  <tag>HEAD</tag>
   </scm>
 	<issueManagement>
@@ -627,7 +627,7 @@
 		</developer>
 	</developers>
 	<pluginRepositories>
-		<pluginRepository>
+<!-- 		<pluginRepository>
 			<id>com.springsource.repository.bundles.milestone</id>
 			<name> SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones</name>
 			<url>http://repository.springsource.com/maven/bundles/milestone</url>
@@ -635,7 +635,7 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
-		<pluginRepository>
+ -->		<pluginRepository>
 			<id>com.springsource.repository.bundles.snapshot</id>
 			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots</name>
 			<url>http://repository.springsource.com/maven/bundles/snapshot</url>
diff --git a/spring-batch-core-tests/pom.xml b/spring-batch-core-tests/pom.xml
index f27e002cd..0cdd87aa8 100644
--- a/spring-batch-core-tests/pom.xml
+++ b/spring-batch-core-tests/pom.xml
@@ -4,7 +4,7 @@
 	<artifactId>spring-batch-core-tests</artifactId>
 	<name>Core Tests</name>
 	<description>Integration tests for the Spring Batch Core</description>
-	<url>http://static.springframework.org/spring-batch/${project.artifactId}</url>
+	<url>http://docs.spring.io/spring-batch/${project.artifactId}</url>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch-parent</artifactId>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index ab40c6462..38bfd8237 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -5,7 +5,7 @@
 	<packaging>jar</packaging>
 	<name>Core</name>
 	<description>Core domain for batch processing, expressing a domain of Jobs, Steps, Chunks, etc.</description>
-	<url>http://static.springframework.org/spring-batch/${project.artifactId}</url>
+	<url>http://docs.spring.io/spring-batch/${project.artifactId}</url>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch-parent</artifactId>
@@ -203,7 +203,7 @@
 									<fileset dir="${basedir}/src/main/sql" includes="schema*.sql.vpp" />
 									<mapper type="glob" from="*.sql.vpp" to="*-sqlf.sql" />
 								</vppcopy>
-								
+
 								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
 									<config>
 										<context>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 94df5fafe..33c31ec2b 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -8,7 +8,7 @@
 	low-level components, interfaces and tools for batch processing
 	applications and optimisations.]]>
 	</description>
-	<url>http://static.springframework.org/spring-batch/${project.artifactId}</url>
+	<url>http://docs.spring.io/spring-batch/${project.artifactId}</url>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch-parent</artifactId>
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index b07eac9a8..de0035681 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -6,12 +6,12 @@
 	<version>2.2.5.BUILD-SNAPSHOT</version>
 	<name>Spring Batch Parent</name>
 	<description>Spring Batch parent project.  Defines dependencies and common configuration for the build process.</description>
-	<url>http://static.springframework.org/spring-batch/${project.artifactId}</url>
+	<url>http://docs.spring.io/spring-batch/${project.artifactId}</url>
 	<packaging>pom</packaging>
 	<scm>
-		<url>http://github.com/SpringSource/spring-batch</url>
-		<connection>scm:git:git://github.com/SpringSource/spring-batch.git</connection>
-		<developerConnection>scm:git:git://github.com/SpringSource/spring-batch.git</developerConnection>
+		<url>https://github.com/spring-projects/spring-batch</url>
+		<connection>scm:git:git://github.com/spring-projects/spring-batch.git</connection>
+		<developerConnection>scm:git:git://github.com/spring-projects/spring-batch.git</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
 	<licenses>
@@ -29,7 +29,7 @@
 		<developer>
 			<id>mminella</id>
 			<name>Michael Minella</name>
-			<email>mminella@vmware.com</email>
+			<email>mminella@gopivotal.com.com</email>
 		</developer>
 	</developers>
 	<properties>
@@ -102,7 +102,7 @@
 				<repository>
 					<id>spring-milestone</id>
 					<name>Spring Milestone Repository</name>
-					<url>s3://maven.springframework.org/milestone</url>
+					<url>http://repo.spring.io/milestone</url>
 				</repository>
 			</distributionManagement>
 		</profile>
@@ -155,7 +155,7 @@
 				<repository>
 					<id>springsource-milestone</id>
 					<name>SpringSource Milestone Repository</name>
-					<url>https://repo.springsource.org/libs-milestone/</url>
+					<url>http://repo.spring.io/libs-milestone</url>
 				</repository>
 				<repository>
 					<id>gemstone</id>
@@ -705,7 +705,7 @@
 				<artifactId>mockito-all</artifactId>
 				<version>1.9.5</version>
 				<scope>test</scope>
-			</dependency>			
+			</dependency>
 			<dependency>
 				 <groupId>org.springframework.data</groupId>
 				 <artifactId>spring-data-commons</artifactId>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 0e89ac257..11d3d9c18 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -4,7 +4,7 @@
 	<artifactId>spring-batch-samples</artifactId>
 	<packaging>jar</packaging>
 	<name>Samples</name>
-	<url>http://static.springframework.org/spring-batch/${artifactId}</url>
+	<url>http://docs.spring.io/spring-batch/${artifactId}</url>
 	<description>Example batch jobs using Spring Batch Core and Execution.</description>
 	<parent>
 		<groupId>org.springframework.batch</groupId>
@@ -422,7 +422,7 @@
 		</pluginManagement>
 	</build>
 	<repositories>
-		<repository>
+<!-- 		<repository>
 			<id>com.springsource.repository.bundles.external</id>
 			<name>SpringSource Enterprise Bundle Repository - SpringSource Bundle External</name>
 			<url>http://repository.springsource.com/maven/bundles/external</url>
@@ -430,7 +430,7 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<repository>
+ -->		<repository>
 			<id>gemstone</id>
 			<name>Release bundles for SQLFire and GemFire</name>
 			<url>http://dist.gemstone.com.s3.amazonaws.com/maven/release</url>