diff --git a/VERSION.txt b/VERSION.txt
index f311baf..273e09e 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -6,6 +6,7 @@ Release notes:
 1.7.0 (not yet released)
 
 #75: Move JDK baseline to Java 8
+- Remove `Automatic-Module-Name` since we provide proper module-info
 
 1.6.0 (10-Oct-2023)
 
diff --git a/pom.xml b/pom.xml
index ffb9af2..00acd7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,6 @@
 com.fasterxml.classmate.*;version=${project.version}
 </osgi.export>
 	<osgi.private>com.fasterxml.classmate.util.*</osgi.private>
-
-	<jdk.module.name>com.fasterxml.classmate</jdk.module.name>
     </properties>
 
     <!-- Licensing -->
@@ -89,17 +87,6 @@ com.fasterxml.classmate.*;version=${project.version}
             </configuration>
           </plugin>
 
-            <!-- As per [#38] add `Automatic-Module-Name` -->
-            <plugin>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>maven-bundle-plugin</artifactId>
-              <configuration>
-		<instructions combine.children="merge">
-		  <Automatic-Module-Name>${jdk.module.name}</Automatic-Module-Name>
-		</instructions>
-              </configuration>
-            </plugin>
-
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>