diff --git a/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt b/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
index b5643ef..275d854 100644
--- a/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES-HDFS-2006.txt
@@ -20,6 +20,8 @@
 
     HADOOP-10567. Shift XAttr value encoding code out for reuse. (Yi Liu via umamahesh)
 
+    HADOOP-10621. Remove CRLF for xattr value base64 encoding for better display.(Yi Liu via umamahesh)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
index 5a78163..e15968d 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/XAttrCodec.java
@@ -57,6 +57,7 @@
   
   private static final String HEX_PREFIX = "0x";
   private static final String BASE64_PREFIX = "0s";
+  private static final Base64 base64 = new Base64(0);
   
   /**
    * Decode string representation of a value and check whether it's 
@@ -86,7 +87,7 @@
           }
         } else if (en.equalsIgnoreCase(BASE64_PREFIX)) {
           value = value.substring(2, value.length());
-          result = Base64.decodeBase64(value);
+          result = base64.decode(value);
         }
       }
       if (result == null) {
@@ -112,7 +113,7 @@
     if (encoding == HEX) {
       return HEX_PREFIX + Hex.encodeHexString(value);
     } else if (encoding == BASE64) {
-      return BASE64_PREFIX + Base64.encodeBase64String(value);
+      return BASE64_PREFIX + base64.encodeToString(value);
     } else {
       return "\"" + new String(value, "utf-8") + "\"";
     }