diff --git a/gradle/publish-maven.gradle b/gradle/publish-maven.gradle
index 499b4d7114b..d323f33f338 100644
--- a/gradle/publish-maven.gradle
+++ b/gradle/publish-maven.gradle
@@ -43,7 +43,7 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = "jhoeller"
 					name = "Juergen Hoeller"
-					email = "jhoeller@vmware.com"
+					email = "jhoeller@gopivotal.com"
 				}
 			}
 			issueManagement {
diff --git a/src/dist/license.txt b/src/dist/license.txt
index 51003b54f16..2fb79ea53c4 100644
--- a/src/dist/license.txt
+++ b/src/dist/license.txt
@@ -265,15 +265,15 @@ components and modifications thereto, if any, (the "Source Files"), by
 downloading the Source Files from http://www.springsource.org/download, or by
 sending a request, with your name and address to:
 
-    VMware, Inc., 3401 Hillview Avenue
-    Palo Alto, CA 94304
+    Pivotal, Inc., 875 Howard St,
+    San Francisco, CA 94103
     United States of America
 
-or email info@vmware.com.  All such requests should clearly specify:
+or email info@gopivotal.com.  All such requests should clearly specify:
 
     OPEN SOURCE FILES REQUEST
     Attention General Counsel
 
-VMware shall mail a copy of the Source Files to you on a CD or equivalent
+Pivotal shall mail a copy of the Source Files to you on a CD or equivalent
 physical medium. This offer to obtain a copy of the Source Files is valid for
 three years from the date you acquired this Software product.
diff --git a/src/dist/notice.txt b/src/dist/notice.txt
index 501109ecd7f..225eeb95d58 100644
--- a/src/dist/notice.txt
+++ b/src/dist/notice.txt
@@ -1,5 +1,5 @@
 Spring Framework ${version}
-Copyright (c) 2002-${copyright} SpringSource, a division of VMware, Inc.
+Copyright (c) 2002-${copyright} Pivotal, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0
 (the "License"). You may not use this product except in compliance with