diff --git a/pom.xml b/pom.xml
index bda342a4be54206ed51dd0b25da1e25ebc596709..ec06caca3b094b8df9d3647e004e385a13b53d5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -727,6 +727,7 @@
             <manifestEntries>
               <X-Compile-Source-JDK>${orekit.compiler.source}</X-Compile-Source-JDK>
               <X-Compile-Target-JDK>${orekit.compiler.target}</X-Compile-Target-JDK>
+              <Automatic-Module-Name>org.orekit</Automatic-Module-Name>
             </manifestEntries>
           </archive>
         </configuration>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 0d17a77cab612ee16feee0590b271b0158f8b7d3..74643c8f188f093ffdde0ee19ee69b87bf2bf693 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -21,6 +21,10 @@
   </properties>
   <body>
     <release version="11.1" date="TBD" description="TBD">
+      <action dev="andrewsgoetz" type="add">
+        Added Automatic-Module-Name "org.orekit" to JAR manifest to improve usability
+        of Orekit by modular Java projects.
+      </action>
       <action dev="bryan" type="fix" issue="874">
         Fixed initialization of maneuver trigger events when using EventBasedManeuverTriggers.
       </action>
