diff --git a/CHANGES.txt b/CHANGES.txt
index cf7ce4dd3b..67b4ccbc12 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -150,6 +150,7 @@ Trunk (unreleased changes)
     HADOOP-7223. FileContext createFlag combinations are not clearly defined.
     (suresh)
 
+    HADOOP-7231. Fix synopsis for -count. (Daryn Sharp via eli).
 
 Release 0.22.0 - Unreleased
 
diff --git a/src/java/org/apache/hadoop/fs/shell/Count.java b/src/java/org/apache/hadoop/fs/shell/Count.java
index 93a04178e8..b365a2263e 100644
--- a/src/java/org/apache/hadoop/fs/shell/Count.java
+++ b/src/java/org/apache/hadoop/fs/shell/Count.java
@@ -43,7 +43,7 @@ public static void registerCommands(CommandFactory factory) {
   }
 
   public static final String NAME = "count";
-  public static final String USAGE = "-" + NAME + "[-q] <path>";
+  public static final String USAGE = "-" + NAME + " [-q] <path> ...";
   public static final String DESCRIPTION = CommandUtils.formatDescription(USAGE, 
       "Count the number of directories, files and bytes under the paths",
       "that match the specified file pattern.  The output columns are:",
diff --git a/src/test/core/org/apache/hadoop/cli/testConf.xml b/src/test/core/org/apache/hadoop/cli/testConf.xml
index fd2bc8b2ce..b14469dbcd 100644
--- a/src/test/core/org/apache/hadoop/cli/testConf.xml
+++ b/src/test/core/org/apache/hadoop/cli/testConf.xml
@@ -222,7 +222,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-count\[-q\] &lt;path&gt;: Count the number of directories, files and bytes under the paths( )*</expected-output>
+          <expected-output>^-count \[-q\] &lt;path&gt; \.\.\.: Count the number of directories, files and bytes under the paths( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>