diff --git a/buildSrc/src/main/groovy/published-java-module.gradle b/buildSrc/src/main/groovy/published-java-module.gradle
index 6a7be6c..176440d 100644
--- a/buildSrc/src/main/groovy/published-java-module.gradle
+++ b/buildSrc/src/main/groovy/published-java-module.gradle
@@ -16,6 +16,17 @@ java {
 	withSourcesJar()
 }
 
+def moduleNameBase = project.name.startsWith( 'hibernate-' ) ? name.drop( 'hibernate-'.length() ): name
+def moduleName = "org.hibernate.$moduleNameBase".replace('-','.')
+
+tasks.named("jar") {
+	manifest {
+		attributes(
+				'Automatic-Module-Name': moduleName
+		)
+	}
+}
+
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Javadoc
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~