diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3043fb3760f..806fb1f4a47 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -591,6 +591,9 @@ Release 2.7.0 - UNRELEASED
 
     HADOOP-11579. Documentation for truncate. (shv)
 
+    HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in
+    hadoop_config.cmd. (Kiran Kumar M R via cnauroth)
+
   OPTIMIZATIONS
 
     HADOOP-11323. WritableComparator#compare keeps reference to byte array.
diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
index 8ae70fbb340..bf86f1b7ac3 100644
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
@@ -65,7 +65,9 @@ if not exist %HADOOP_HOME%\share\hadoop\common\hadoop-common-*.jar (
     exit /b 1
 )
 
-set HADOOP_CONF_DIR=%HADOOP_HOME%\etc\hadoop
+if not defined HADOOP_CONF_DIR (
+  set HADOOP_CONF_DIR=%HADOOP_HOME%\etc\hadoop
+)
 
 @rem
 @rem Allow alternate conf dir location.