diff --git a/build.gradle.kts b/build.gradle.kts
index 9dd27a7..e595380 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,9 +22,10 @@ java {
 tasks.jar {
     manifest {
         attributes(
-            "Implementation-Title" to "de.jotoho.waituntil",
-            "Implementation-Version" to "${project.version}",
-            "Main-Class" to "de.jotoho.waituntil.Main"
+            "Implementation-Title" to project.name,
+            "Implementation-Version" to project.version,
+            "Main-Class" to "de.jotoho.waituntil.Main",
+            "Main-Module" to "de.jotoho.waituntil.main"
         )
     }
 }
@@ -32,4 +33,5 @@ tasks.jar {
 application {
     // Define the main class for the application.
     mainClass.set("de.jotoho.waituntil.Main")
+    mainModule.set("de.jotoho.waituntil.main")
 }
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..72e6d14
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,2 @@
+module de.jotoho.waituntil.main {
+}
\ No newline at end of file