diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index f7900363364..fe469284d30 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -196,6 +196,8 @@ Release 0.23.3 - UNRELEASED
     HADOOP-6941. Adds support for building Hadoop with IBM's JDK 
     (Stephen Watt, Eli and ddas)
 
+    HADOOP-8183. Stop using "mapred.used.genericoptions.parser" (harsh)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
index 5189e8e0535..71c21082669 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
@@ -305,7 +305,7 @@ public class GenericOptionsParser {
         }
       }
     }
-    conf.setBoolean("mapred.used.genericoptionsparser", true);
+    conf.setBoolean("mapreduce.client.genericoptionsparser.used", true);
     
     // tokensFile
     if(line.hasOption("tokenCacheFile")) {