diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 059b302197d..a23a7fa3643 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -1630,7 +1630,7 @@ for ldap providers in the same way as above does.
   </description>
 </property>
 <property>
-  <name>"hadoop.security.kms.client.encrypted.key.cache.expiry</name>
+  <name>hadoop.security.kms.client.encrypted.key.cache.expiry</name>
   <value>43200000</value>
   <description>
     Cache expiry time for a Key, after which the cache Queue for this
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d84f2578066..1e76a3b811a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -687,6 +687,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone.
     (clamb via yliu)
 
+    HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry
+    property spelled wrong in core-default. (Stephen Chu via yliu)
+
     BREAKDOWN OF HDFS-6581 SUBTASKS AND RELATED JIRAS
   
       HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)