diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 8260ea857c6..1de102db627 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -37,6 +37,10 @@ Release 2.7.4 - UNRELEASED
     HADOOP-13579. Fix source-level compatibility after HADOOP-11252.
     (Tsuyoshi Ozawa via aajisaka)
 
+    HADOOP-12597. In kms-site.xml configuration
+    "hadoop.security.keystore.JavaKeyStoreProvider.password" should be updated with
+    new name. (Contributed by Surendra Singh Lilhore via Brahma Reddy Battula)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml b/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml
index a810ca44d29..e8d2344a4a9 100644
--- a/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml
+++ b/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml
@@ -25,10 +25,10 @@
   </property>
 
   <property>
-    <name>hadoop.security.keystore.JavaKeyStoreProvider.password</name>
-    <value>none</value>
+    <name>hadoop.security.keystore.java-keystore-provider.password-file</name>
+    <value>kms.keystore.password</value>
     <description>
-      If using the JavaKeyStoreProvider, the password for the keystore file.
+      If using the JavaKeyStoreProvider, the file name for the keystore password.
     </description>
   </property>