diff --git a/BlueMapCommon/build.gradle.kts b/BlueMapCommon/build.gradle.kts
index 65e17f8a..24e448fc 100644
--- a/BlueMapCommon/build.gradle.kts
+++ b/BlueMapCommon/build.gradle.kts
@@ -18,6 +18,7 @@ java {
     sourceCompatibility = JavaVersion.toVersion(javaTarget)
     targetCompatibility = JavaVersion.toVersion(javaTarget)
     withSourcesJar()
+    withJavadocJar()
 }
 
 repositories {
@@ -50,6 +51,20 @@ spotless {
     }
 }
 
+tasks.javadoc {
+    options {
+        (this as? StandardJavadocDocletOptions)?.apply {
+            links(
+                "https://docs.oracle.com/en/java/javase/16/docs/api/",
+                "https://javadoc.io/doc/com.flowpowered/flow-math/1.0.3/",
+                "https://javadoc.io/doc/com.google.code.gson/gson/2.8.0/",
+            )
+            addStringOption("Xdoclint:none", "-quiet")
+            addBooleanOption("html5", true)
+        }
+    }
+}
+
 node {
     version.set("20.14.0")
     download.set(true)
diff --git a/BlueMapCore/build.gradle.kts b/BlueMapCore/build.gradle.kts
index ecdda51e..b11881f6 100644
--- a/BlueMapCore/build.gradle.kts
+++ b/BlueMapCore/build.gradle.kts
@@ -39,9 +39,9 @@ val commits = "git rev-list --count $lastTag..HEAD".runCommand()
 println("Git hash: $gitHash" + if (clean) "" else " (dirty)")
 
 group = "de.bluecolored.bluemap"
-version = lastVersion //+
-        //(if (commits == "0") "" else "-$commits") +
-        //(if (clean) "" else "-dirty")
+version = lastVersion +
+        (if (commits == "0") "" else "-$commits") +
+        (if (clean) "" else "-dirty")
 
 System.setProperty("bluemap.version", version.toString())
 System.setProperty("bluemap.lastVersion", lastVersion)
@@ -52,6 +52,7 @@ java {
     sourceCompatibility = JavaVersion.toVersion(javaTarget)
     targetCompatibility = JavaVersion.toVersion(javaTarget)
     withSourcesJar()
+    withJavadocJar()
 }
 
 repositories {
@@ -92,6 +93,20 @@ spotless {
     }
 }
 
+tasks.javadoc {
+    options {
+        (this as? StandardJavadocDocletOptions)?.apply {
+            links(
+                "https://docs.oracle.com/en/java/javase/16/docs/api/",
+                "https://javadoc.io/doc/com.flowpowered/flow-math/1.0.3/",
+                "https://javadoc.io/doc/com.google.code.gson/gson/2.8.0/",
+            )
+            addStringOption("Xdoclint:none", "-quiet")
+            addBooleanOption("html5", true)
+        }
+    }
+}
+
 tasks.withType(JavaCompile::class).configureEach {
     options.apply {
         encoding = "utf-8"