diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
index 85b9d6ca876..a3af28a4f8c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
@@ -133,7 +133,7 @@ public enum RollingUpgradeAction {
       }
     }
 
-    /** Covert the given String to a RollingUpgradeAction. */
+    /** Convert the given String to a RollingUpgradeAction. */
     public static RollingUpgradeAction fromString(String s) {
       return MAP.get(StringUtils.toUpperCase(s));
     }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index b95385859e1..adb60aa5932 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -973,6 +973,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9503. Use generic option -fs for NNThroughputBenchmark instead of
     -namenode. (Mingliang Liu via shv)
 
+    HDFS-9777. Fix typos in DFSAdmin command line and documentation.
+    (Wei-Chiu Chuang via umamahesh)
+
   OPTIMIZATIONS
 
     HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml
index 5514700d081..e4915a72a53 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml
@@ -3308,7 +3308,7 @@ order written.</p>]]>
       deprecated="not deprecated">
       <param name="s" type="java.lang.String"/>
       <doc>
-      <![CDATA[Covert the given String to a RollingUpgradeAction.]]>
+      <![CDATA[Convert the given String to a RollingUpgradeAction.]]>
       </doc>
     </method>
   </class>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
index 59be89c624d..44dfcd9d8f6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
@@ -373,7 +373,7 @@ static int run(DistributedFileSystem dfs, String[] argv, int idx) throws IOExcep
       final RollingUpgradeAction action = RollingUpgradeAction.fromString(
           argv.length >= 2? argv[1]: "");
       if (action == null) {
-        throw new IllegalArgumentException("Failed to covert \"" + argv[1]
+        throw new IllegalArgumentException("Failed to convert \"" + argv[1]
             +"\" to " + RollingUpgradeAction.class.getSimpleName());
       }