diff --git a/.mailmap b/.mailmap
index c0ca085f71..92baa202da 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,14 +1,23 @@
-Juergen Hoeller <jhoeller@vmware.com> jhoeller <jhoeller@vmware.com>
-<rstoyanchev@gopivotal.com> <rstoyanchev@vmware.com>
-<pwebb@gopivotal.com> <pwebb@vmware.com>
-<cbeams@gopivotal.com> <cbeams@vmware.com>
-<cbeams@gopivotal.com> <cbeams@gmail.com>
-<apoutsma@gopivotal.com> <apoutsma@vmware.com>
-<apoutsma@gopivotal.com> <poutsma@mac.com>
-<ogierke@gopivotal.com> <ogierke@vmware.com>
-<dsyer@gopivotal.com> <david_syer@hotmail.com>
-<dsyer@gopivotal.com> <dsyer@vmware.com>
-<aclement@gopivotal.com> <andrew.clement@gmail.com>
-<aclement@gopivotal.com> <aclement@vmware.com>
+Juergen Hoeller <jhoeller@pivotal.io> jhoeller <jhoeller@vmware.com>
+<jhoeller@pivotal.io> <jhoeller@vmware.com>
+<jhoeller@pivotal.io> <jhoeller@gopivotal.com>
+<rstoyanchev@pivotal.io> <rstoyanchev@vmware.com>
+<rstoyanchev@pivotal.io> <rstoyanchev@gopivotal.com>
+<pwebb@pivotal.io> <pwebb@vmware.com>
+<pwebb@pivotal.io> <pwebb@gopivotal.com>
+<cbeams@pivotal.io> <cbeams@vmware.com>
+<cbeams@pivotal.io> <cbeams@gopivotal.com>
+<cbeams@pivotal.io> <cbeams@gmail.com>
+<apoutsma@pivotal.io> <apoutsma@vmware.com>
+<apoutsma@pivotal.io> <apoutsma@gopivotal.com>
+<apoutsma@pivotal.io> <poutsma@mac.com>
+<ogierke@pivotal.io> <ogierke@vmware.com>
+<ogierke@pivotal.io> <ogierke@gopivotal.com>
+<dsyer@pivotal.io> <dsyer@vmware.com>
+<dsyer@pivotal.io> <dsyer@gopivotal.com>
+<dsyer@pivotal.io> <david_syer@hotmail.com>
+<aclement@pivotal.io> <aclement@vmware.com>
+<aclement@pivotal.io> <aclement@gopivotal.com>
+<aclement@pivotal.io> <andrew.clement@gmail.com>
 <dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
-Nick Williams <nicholas@nicholaswilliams.net> Nicholas Williams <nicholas@nicholaswilliams.net> 
+Nick Williams <nicholas@nicholaswilliams.net> Nicholas Williams <nicholas@nicholaswilliams.net>
diff --git a/gradle/publish-maven.gradle b/gradle/publish-maven.gradle
index 676f6202be..1145e112a6 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@gopivotal.com"
+					email = "jhoeller@pivotal.io"
 				}
 			}
 			issueManagement {
diff --git a/src/dist/license.txt b/src/dist/license.txt
index 2fb79ea53c..d257a785dd 100644
--- a/src/dist/license.txt
+++ b/src/dist/license.txt
@@ -269,7 +269,7 @@ sending a request, with your name and address to:
     San Francisco, CA 94103
     United States of America
 
-or email info@gopivotal.com.  All such requests should clearly specify:
+or email info@pivotal.io.  All such requests should clearly specify:
 
     OPEN SOURCE FILES REQUEST
     Attention General Counsel