diff --git a/gradle/java/jar-manifest.gradle b/gradle/java/jar-manifest.gradle
index bb45405aa30..2840b8b7424 100644
--- a/gradle/java/jar-manifest.gradle
+++ b/gradle/java/jar-manifest.gradle
@@ -64,7 +64,9 @@ subprojects {
               "X-Compile-Target-JDK"  : "${-> project.targetCompatibility}",
 
               "X-Build-JDK"           : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
-              "X-Build-OS"            : "${System.properties['os.name']} ${System.properties['os.arch']} ${System.properties['os.version']}"
+              "X-Build-OS"            : "${System.properties['os.name']} ${System.properties['os.arch']} ${System.properties['os.version']}",
+
+              "Automatic-Module-Name" : "${-> project.path.replaceFirst(":", "").replace(':', '.').replace("-", "_")}"
             ])
           }
 
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 931f7962741..01ddb39d71b 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -228,6 +228,8 @@ API Changes
 Improvements
 ---------------------
 
+* LUCENE-10234: Added Automatic-Module-Name to all JARs. (Dawid Weiss)
+
 * LUCENE-10182: TestRamUsageEstimator used RamUsageTester.sizeOf throughout, making some of the
   tests trivial. Now, it compares results from RamUsageEstimator with those from RamUsageTester.
   To prevent this error in the future, RamUsageTester.sizeOf was renamed to ramUsed.