diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/resources/core-site.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/resources/core-site.xml
index f90ca03c3b6..f400bf2ff43 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/resources/core-site.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/resources/core-site.xml
@@ -20,10 +20,24 @@
 <property>
   <name>nfs.server.port</name>
   <value>2079</value>
+  <description>
+    Specify the port number used by Hadoop NFS.
+    Notice that the default value here is different than the default Hadoop nfs
+    port 2049 specified in hdfs-default.xml. 2049 is also the default port for
+    Linux nfs. The setting here allows starting Hadoop nfs for testing even if
+    nfs server (linux or Hadoop) is aready running on he same host.
+  </description>
 </property>
 
 <property>
   <name>nfs.mountd.port</name>
   <value>4272</value>
+  <description>
+    Specify the port number used by Hadoop mount daemon.
+    Notice that the default value here is different than 4242 specified in 
+    hdfs-default.xml. This setting allows starting Hadoop nfs mountd for
+    testing even if the Linux or Hadoop mountd is already running on the
+    same host.
+  </description>
 </property>
 </configuration>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 1679a711d0e..a244daba076 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -421,6 +421,9 @@ Release 2.7.0 - UNRELEASED
 
     HDFS-6735. A minor optimization to avoid pread() be blocked by read()
     inside the same DFSInputStream (Lars Hofhansl via stack)
+    
+    HDFS-7458. Add description to the nfs ports in core-site.xml used by nfs
+    test to avoid confusion (Yongjun Zhang via brandonli)
 
   OPTIMIZATIONS