diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index b576c29297..39ff8cc3a7 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -317,6 +317,9 @@ Release 2.7.0 - UNRELEASED
     MAPREDUCE-6230. Fixed RMContainerAllocator to update the new AMRMToken
     service name properly. (Jason Lowe via jianhe)
 
+    MAPREDUCE-6231. Grep example job is not working on a fully-distributed
+    cluster. (aajisaka)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java
index 421afcd7ac..810d0dd1ad 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/Grep.java
@@ -61,6 +61,7 @@ public int run(String[] args) throws Exception {
     try {
       
       grepJob.setJobName("grep-search");
+      grepJob.setJarByClass(Grep.class);
 
       FileInputFormat.setInputPaths(grepJob, args[0]);
 
@@ -78,6 +79,7 @@ public int run(String[] args) throws Exception {
 
       Job sortJob = new Job(conf);
       sortJob.setJobName("grep-sort");
+      sortJob.setJarByClass(Grep.class);
 
       FileInputFormat.setInputPaths(sortJob, tempDir);
       sortJob.setInputFormatClass(SequenceFileInputFormat.class);