diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
index 8e2d4efcdd..0c4500c141 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
@@ -2339,10 +2339,10 @@ public abstract class FileSystem extends Configured implements Closeable {
   }
 
   /**
-   * Gets the ACLs of files and directories.
+   * Gets the ACL of a file or directory.
    *
    * @param path Path to get
-   * @return RemoteIterator<AclStatus> which returns each AclStatus
+   * @return AclStatus describing the ACL of the file or directory
    * @throws IOException if an ACL could not be read
    */
   public AclStatus getAclStatus(Path path) throws IOException {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt
index 0cbb1bae04..7b07ed58e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt
@@ -24,6 +24,8 @@ HDFS-4685 (Unreleased)
     HADOOP-10187. FsShell CLI: add getfacl and setfacl with minimal support for
     getting and setting ACLs. (Vinay via cnauroth)
 
+    HADOOP-10192. FileSystem#getAclStatus has incorrect JavaDocs. (cnauroth)
+
   OPTIMIZATIONS
 
   BUG FIXES