diff --git a/ebean-core/src/main/resources/META-INF/MANIFEST.MF b/ebean-core/src/main/resources/META-INF/MANIFEST.MF
index 69302cc7e..52ef5c4ce 100644
--- a/ebean-core/src/main/resources/META-INF/MANIFEST.MF
+++ b/ebean-core/src/main/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Premain-Class: io.ebean.enhance.agent.Transformer
-Automatic-Module-Name: io.ebean
+Automatic-Module-Name: io.ebean.core
 Bundle-ManifestVersion: 2
 Bundle-Name: Ebean-ORM
 Bundle-SymbolicName: io.ebean
diff --git a/ebean/pom.xml b/ebean/pom.xml
index a1546cbe7..615233146 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -47,4 +47,18 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <archive>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/ebean/src/main/resources/META-INF/MANIFEST.MF b/ebean/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..48b57ad58
--- /dev/null
+++ b/ebean/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: io.ebean