diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 7d5d11aaf29..0624b80eeaa 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -689,6 +689,8 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6068. Illegal progress value warnings in map tasks. (Binglin Chang
     via junping_du)
 
+    MAPREDUCE-6601. Fix typo in Job#setUseNewAPI. (Kai Sasaki via aajisaka)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
index ded9d651bb0..481107f39d8 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java
@@ -1258,7 +1258,7 @@ public void setCancelDelegationTokenUponJobCompletion(boolean value) {
   /**
    * Default to the new APIs unless they are explicitly set or the old mapper or
    * reduce attributes are used.
-   * @throws IOException if the configuration is inconsistant
+   * @throws IOException if the configuration is inconsistent
    */
   private void setUseNewAPI() throws IOException {
     int numReduces = conf.getNumReduceTasks();
@@ -1276,7 +1276,7 @@ private void setUseNewAPI() throws IOException {
         ensureNotSet("mapred.output.format.class", mode);
       }      
     } else {
-      String mode = "map compatability";
+      String mode = "map compatibility";
       ensureNotSet(INPUT_FORMAT_CLASS_ATTR, mode);
       ensureNotSet(MAP_CLASS_ATTR, mode);
       if (numReduces != 0) {
@@ -1293,7 +1293,7 @@ private void setUseNewAPI() throws IOException {
         ensureNotSet("mapred.output.format.class", mode);
         ensureNotSet(oldReduceClass, mode);   
       } else {
-        String mode = "reduce compatability";
+        String mode = "reduce compatibility";
         ensureNotSet(OUTPUT_FORMAT_CLASS_ATTR, mode);
         ensureNotSet(REDUCE_CLASS_ATTR, mode);   
       }