diff --git a/build.gradle b/build.gradle
index 58cd05885d..7be396aef5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -253,6 +253,7 @@ subprojects { subproject ->
 					'Implementation-Vendor-Id': subproject.group,
 					'Implementation-Vendor': 'Pivotal Software, Inc.',
 					'Implementation-URL': linkHomepage,
+					'Automatic-Module-Name': subproject.name.replace('-', '.')  // for Jigsaw
 			)
 		}
 	}