diff --git a/core-jdk8/pom.xml b/core-jdk8/pom.xml
index 171f5b076..6d26c56ee 100644
--- a/core-jdk8/pom.xml
+++ b/core-jdk8/pom.xml
@@ -152,6 +152,11 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.mapstruct</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index ae7ca0e79..c7718ea5f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -143,6 +143,11 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.mapstruct</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/processor/pom.xml b/processor/pom.xml
index 06d88925c..a45ec6a9d 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -137,6 +137,9 @@
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                         </manifest>
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.mapstruct.processor</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>