diff --git a/CHANGES.txt b/CHANGES.txt
index 71d9ee0c701..3415a8e229d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -862,6 +862,9 @@ Trunk (unreleased changes)
     HADOOP-6122. The great than operator in test-patch.sh should be "-gt" but
     not ">".  (szetszwo)
 
+    HADOOP-6114. Fix javadoc documentation for FileStatus.getLen.
+    (Dmitry Rzhevskiy via dhruba)
+
 Release 0.20.1 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/java/org/apache/hadoop/fs/FileStatus.java b/src/java/org/apache/hadoop/fs/FileStatus.java
index 124984658cd..5a1acecc6cd 100644
--- a/src/java/org/apache/hadoop/fs/FileStatus.java
+++ b/src/java/org/apache/hadoop/fs/FileStatus.java
@@ -67,8 +67,9 @@ public FileStatus(long length, boolean isdir, int block_replication,
     this.path = path;
   }
 
-  /* 
-   * @return the length of this file, in blocks
+  /**
+   * Get the length of this file, in bytes.
+   * @return the length of this file, in bytes.
    */
   public long getLen() {
     return length;