diff --git a/CHANGES b/CHANGES
index 2a464a57de5..42e8bfbc240 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 Version 1.6.7
 -------------
 
--
+- Add Automatic-Module-Name to manifest so we have basic Java 9 support.
 
 Version 1.6.6
 -------------
diff --git a/sentry-android/pom.xml b/sentry-android/pom.xml
index 7625b8580ae..a5085439803 100644
--- a/sentry-android/pom.xml
+++ b/sentry-android/pom.xml
@@ -108,6 +108,9 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.sentry.android</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
diff --git a/sentry-log4j/pom.xml b/sentry-log4j/pom.xml
index fce516abc9c..605a555d351 100644
--- a/sentry-log4j/pom.xml
+++ b/sentry-log4j/pom.xml
@@ -112,6 +112,9 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.sentry.log4j</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
diff --git a/sentry-log4j2/pom.xml b/sentry-log4j2/pom.xml
index 24edd4b8c8e..6f2ffa49a59 100644
--- a/sentry-log4j2/pom.xml
+++ b/sentry-log4j2/pom.xml
@@ -117,6 +117,9 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.sentry.log4j2</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
diff --git a/sentry-logback/pom.xml b/sentry-logback/pom.xml
index 93174cced08..35a8d25f542 100644
--- a/sentry-logback/pom.xml
+++ b/sentry-logback/pom.xml
@@ -110,6 +110,9 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.sentry.logback</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
diff --git a/sentry-spring/pom.xml b/sentry-spring/pom.xml
index 33d704b9454..f2ce1bf70cb 100644
--- a/sentry-spring/pom.xml
+++ b/sentry-spring/pom.xml
@@ -115,6 +115,9 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.sentry.spring</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
diff --git a/sentry/pom.xml b/sentry/pom.xml
index a2e5c1d7484..39b6a560d25 100644
--- a/sentry/pom.xml
+++ b/sentry/pom.xml
@@ -138,6 +138,9 @@
                 <configuration>
                     <archive>
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Automatic-Module-Name>io.sentry</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
                 <executions>