diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index 7270e6703..9c9fc16e1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -116,7 +116,7 @@ public class GenerateKey extends Task {
          */
         @Override
         public String toString() {
-            return params.stream().map(p -> p.getName() + "=" + p.getValue())
+            return params.stream().map(p -> encode(p.getName()) + "=" + encode(p.getValue()))
                 .collect(Collectors.joining(", "));
         }