diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 4fcf524b3fe..b9443b4edce 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -654,6 +654,8 @@ Release 2.8.0 - UNRELEASED
     HDFS-8257. Namenode rollingUpgrade option is incorrect in document
     (J.Andreina via vinayakumarb)
 
+    HDFS-8067. haadmin prints out stale help messages (Ajith S via vinayakumarb)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java
index aa69dca699e..4c0ddb29859 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSHAAdmin.java
@@ -90,7 +90,7 @@ protected HAServiceTarget resolveTarget(String nnId) {
 
   @Override
   protected String getUsageString() {
-    return "Usage: haadmin";
+    return "Usage: haadmin [-ns <nameserviceId>]";
   }
 
   @Override