diff --git a/pom.xml b/pom.xml
index b16c726..48035b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 	</developers>
 
 	<properties>
-		<jdk.version>8</jdk.version>
+		<jdk.version>11</jdk.version>
 		<package.name>com.github.f4b6a3.ulid</package.name>
 		<maven.compiler.source>${jdk.version}</maven.compiler.source>
 		<maven.compiler.target>${jdk.version}</maven.compiler.target>
@@ -68,8 +68,6 @@
 				<configuration>
 					<archive>
 						<manifestEntries>
-							<!-- Java Modularity -->
-							<Automatic-Module-Name>${package.name}</Automatic-Module-Name>
 							<!-- OSGi Modularity -->
 							<Bundle-ManifestVersion>2</Bundle-ManifestVersion>
 							<Bundle-Name>${project.artifactId}</Bundle-Name>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..b30141e
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module com.github.f4b6a3.ulid {
+    exports com.github.f4b6a3.ulid;
+}
\ No newline at end of file