diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6abe4e78..052ee1cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
     - Removed support for the old `org.jetbrains.dokka-android` plugin
 - Remove usages of deprecated Gradle API that is scheduled to be removed in Gradle 9.0
 - Raised minimum supported Gradle version
+- Improve naming of javadoc jars
 
 #### Minimum supported versions
 - JDK 11
diff --git a/plugin/src/main/kotlin/com/vanniktech/maven/publish/tasks/JavadocJar.kt b/plugin/src/main/kotlin/com/vanniktech/maven/publish/tasks/JavadocJar.kt
index 6f6e867f..faecaaeb 100644
--- a/plugin/src/main/kotlin/com/vanniktech/maven/publish/tasks/JavadocJar.kt
+++ b/plugin/src/main/kotlin/com/vanniktech/maven/publish/tasks/JavadocJar.kt
@@ -27,7 +27,7 @@ open class JavadocJar : Jar() {
       "${prefix}EmptyJavadocJar",
       JavadocJar::class.java,
     ) {
-      it.archiveBaseName.set("$prefix-javadoc")
+      it.archiveBaseName.set("${project.name}-$prefix-javadoc")
     }
 
     private fun Project.plainJavadocJar(prefix: String): TaskProvider<*> {
@@ -35,7 +35,7 @@ open class JavadocJar : Jar() {
         val task = tasks.named("javadoc")
         it.dependsOn(task)
         it.from(task)
-        it.archiveBaseName.set("$prefix-javadoc")
+        it.archiveBaseName.set("${project.name}-$prefix-javadoc")
       }
     }
 
@@ -47,7 +47,7 @@ open class JavadocJar : Jar() {
         }
         it.dependsOn(task)
         it.from(task)
-        it.archiveBaseName.set("$prefix-javadoc")
+        it.archiveBaseName.set("${project.name}-$prefix-javadoc")
       }
     }
   }