diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bef5d5f3..9d75951c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 As this project is pre 1.0, breaking changes may happen for minor version bumps. A breaking change will get clearly notified in this log.
 
 ## Pending
+* Fix the issue of javadocJar not including documentation. ([#539](https://github.com/stellar/java-stellar-sdk/pull/539))
+* Publish sourcesJar to the GitHub Release page. ([#539](https://github.com/stellar/java-stellar-sdk/pull/539))
 
 ## 0.41.0
 * Add support for Soroban Preview 11. ([#530](https://github.com/stellar/java-stellar-sdk/pull/530))
diff --git a/build.gradle.kts b/build.gradle.kts
index 5c82b97c0..5603ca672 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -57,6 +57,16 @@ tasks {
         archiveFileName = "stellar-sdk.jar"
     }
 
+    val sourcesJar by creating(Jar::class) {
+        manifest {
+            attributes["Implementation-Title"] = "stellar-sdk"
+            attributes["Implementation-Version"] = version
+        }
+        archiveClassifier = "sources"
+        archiveFileName = "stellar-sdk-sources.jar"
+        from(sourceSets.main.get().allSource)
+    }
+
     val uberJar by creating(Jar::class) {
         // https://docs.gradle.org/current/userguide/working_with_files.html#sec:creating_uber_jar_example
         manifest {
@@ -73,17 +83,6 @@ tasks {
         })
     }
 
-    val javadocJar by creating(Jar::class) {
-        manifest {
-            attributes["Implementation-Title"] = "stellar-sdk"
-            attributes["Implementation-Version"] = version
-        }
-        archiveClassifier = "javadoc"
-        archiveFileName = "stellar-sdk-javadoc.jar"
-        dependsOn(javadoc)
-        from(javadoc.get().destinationDir)
-    }
-
     javadoc {
         destinationDir = file("javadoc")
         isFailOnError = false
@@ -97,6 +96,17 @@ tasks {
         }
     }
 
+    val javadocJar by creating(Jar::class) {
+        manifest {
+            attributes["Implementation-Title"] = "stellar-sdk"
+            attributes["Implementation-Version"] = version
+        }
+        archiveClassifier = "javadoc"
+        archiveFileName = "stellar-sdk-javadoc.jar"
+        dependsOn(javadoc)
+        from(javadoc.get().destinationDir) // It needs to be placed after the javadoc task, otherwise it cannot read the path we set.
+    }
+
     register<Copy>("updateGitHook") {
         from("scripts/pre-commit.sh") { rename { it.removeSuffix(".sh") } }
         into(".git/hooks")
@@ -118,6 +128,7 @@ artifacts {
     archives(tasks.jar)
     archives(tasks["uberJar"])
     archives(tasks["javadocJar"])
+    archives(tasks["sourcesJar"])
 }
 
 publishing {
@@ -126,6 +137,7 @@ publishing {
             from(components["java"])
             artifact(tasks["uberJar"])
             artifact(tasks["javadocJar"])
+            artifact(tasks["sourcesJar"])
             pom {
                 name.set("java-stellar-sdk")
                 description.set("The Java Stellar SDK library provides APIs to build transactions and connect to Horizon and Soroban-RPC server.")