diff --git a/hadoop-common/CHANGES.txt b/hadoop-common/CHANGES.txt
index d5d41735a8..51d2567465 100644
--- a/hadoop-common/CHANGES.txt
+++ b/hadoop-common/CHANGES.txt
@@ -486,6 +486,8 @@ Trunk (unreleased changes)
     HADOOP-7357. hadoop.io.compress.TestCodec#main() should exit with
     non-zero exit code if test failed. (Philip Zeyliger via eli)
 
+    HADOOP-6622. Token should not print the password in toString. (eli)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java b/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
index eac07c5f75..d47f99429f 100644
--- a/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
+++ b/hadoop-common/src/main/java/org/apache/hadoop/security/token/Token.java
@@ -238,8 +238,6 @@ public class Token<T extends TokenIdentifier> implements Writable {
     StringBuilder buffer = new StringBuilder();
     buffer.append("Ident: ");
     addBinaryBuffer(buffer, identifier);
-    buffer.append(", Pass: ");
-    addBinaryBuffer(buffer, password);
     buffer.append(", Kind: ");
     buffer.append(kind.toString());
     buffer.append(", Service: ");