diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index ef661b3f7fa..5a583825505 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -194,6 +194,9 @@ Release 0.23.2 - UNRELEASED
MAPREDUCE-3913. RM application webpage is unresponsive after 2000 jobs
(Jason Lowe via tgraves)
+ MAPREDUCE-3922. Fixed build to not compile 32bit container-executor binary
+ by default on all platforms. (Hitesh Shah via vinodkv)
+
Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
index f3c2ab6fab9..1272dde76fa 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -28,6 +28,7 @@
${project.parent.parent.basedir}
/etc/hadoop
+
@@ -74,7 +75,7 @@
CFLAGS
- -DHADOOP_CONF_DIR=${container-executor.conf.dir} -m32
+ -DHADOOP_CONF_DIR=${container-executor.conf.dir} ${container-executor.additional_cflags}
${project.build.directory}/native/container-executor