diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index df79e09486..a8f8633d72 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -601,6 +601,8 @@ Release 0.23.3 - UNRELEASED
     MAPREDUCE-3889. job client tries to use /tasklog interface, but that
     doesn't exist anymore (Devaraj K via bobby)
 
+    MAPREDUCE-4320. gridmix mainClass wrong in pom.xml (tgraves)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml
index 9537883464..15ed600324 100644
--- a/hadoop-tools/hadoop-gridmix/pom.xml
+++ b/hadoop-tools/hadoop-gridmix/pom.xml
@@ -121,7 +121,7 @@
          <configuration>
           <archive>
            <manifest>
-            <mainClass>org.apache.hadoop.tools.HadoopArchives</mainClass>
+            <mainClass>org.apache.hadoop.mapred.gridmix.Gridmix</mainClass>
            </manifest>
          </archive>
         </configuration>