diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 1eec55fc361..d2c4ab8ecce 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -387,6 +387,9 @@ Release 2.7.0 - UNRELEASED
     MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked
     twice (Tsuyoshi OZAWA via jlowe)
 
+    MAPREDUCE-2815. JavaDoc does not generate correctly for
+    MultithreadedMapRunner. (Chris Palmer via aajisaka)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
index 456cdfab9a8..98d794bf46a 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
@@ -36,17 +36,17 @@
 import java.util.concurrent.*;
 
 /**
- * Multithreaded implementation for @link org.apache.hadoop.mapred.MapRunnable.
+ * Multithreaded implementation for {@link MapRunnable}.
  * <p>
  * It can be used instead of the default implementation,
- * @link org.apache.hadoop.mapred.MapRunner, when the Map operation is not CPU
- * bound in order to improve throughput.
+ * of {@link org.apache.hadoop.mapred.MapRunner}, when the Map
+ * operation is not CPU bound in order to improve throughput.
  * <p>
  * Map implementations using this MapRunnable must be thread-safe.
  * <p>
  * The Map-Reduce job has to be configured to use this MapRunnable class (using
  * the JobConf.setMapRunnerClass method) and
- * the number of thread the thread-pool can use with the
+ * the number of threads the thread-pool can use with the
  * <code>mapred.map.multithreadedrunner.threads</code> property, its default
  * value is 10 threads.
  * <p>