diff --git a/build.gradle b/build.gradle
index 12cc46d0..be86ca79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -279,7 +279,7 @@ subprojects { subproject ->
 					'Created-By': "JDK ${System.properties['java.version']} (${System.properties['java.specification.vendor']})",
 					'Implementation-Title': subproject.name,
 					'Implementation-Vendor-Id': subproject.group,
-					'Implementation-Vendor': 'Pivotal Software, Inc.',
+					'Implementation-Vendor': 'VMware Inc.',
 					'Implementation-URL': linkHomepage,
 					'Automatic-Module-Name': subproject.name.replace('-', '.')  // for Jigsaw
 			)
diff --git a/publish-maven.gradle b/publish-maven.gradle
index 9a19567b..fb5df899 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -30,13 +30,13 @@ publishing {
 					developer {
 						id = 'garyrussell'
 						name = 'Gary Russell'
-						email = 'grussell@pivotal.io'
+						email = 'grussell@vmware.com'
 						roles = ["project lead"]
 					}
 					developer {
 						id = 'abilan'
 						name = 'Artem Bilan'
-						email = 'abilan@pivotal.io'
+						email = 'abilan@vmware.com'
 						roles = ["contributor"]
 					}
 				}