diff --git a/dist/build.gradle b/dist/build.gradle
index 800b2450b3..874c174ebe 100644
--- a/dist/build.gradle
+++ b/dist/build.gradle
@@ -35,6 +35,8 @@ dependencies {
     implementation project(':server-auth:shiro')
     implementation project(':server-mirror-git')
     implementation project(':xds')
+    // Add the optionalImplementation to copy the JAR into the distribution directory.
+    implementation libs.jcommander
 
     // Logging
     runtimeOnly libs.logback12
diff --git a/server/build.gradle b/server/build.gradle
index 607838e055..e43f78869e 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     // DiffUtils
     implementation libs.diffutils
 
-    // jCommander
+    // jCommander. optionalImplementation must be also added to the :dist dependencies.
     optionalImplementation libs.jcommander
 
     // Because the default targetJavaVersion is 8, jgit5 is chosen and published with the server artifact.