diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index e0026a71f9..db773ebd9e 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -179,7 +179,9 @@ Release 2.4.1 - UNRELEASED
 
   OPTIMIZATIONS
 
-  BUG FIXES 
+  BUG FIXES
+
+    MAPREDUCE-5818. Added "hsadmin" command into mapred.cmd. (Jian He via zjshen)
 
 Release 2.4.0 - 2014-04-07 
 
diff --git a/hadoop-mapreduce-project/bin/mapred.cmd b/hadoop-mapreduce-project/bin/mapred.cmd
index 1eb5803fba..8457ba073c 100644
--- a/hadoop-mapreduce-project/bin/mapred.cmd
+++ b/hadoop-mapreduce-project/bin/mapred.cmd
@@ -135,6 +135,10 @@ goto :eof
   set CLASSPATH=%CLASSPATH%;%TOO_PATH%
   set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
 
+:hsadmin
+  set CLASS=org.apache.hadoop.mapreduce.v2.hs.client.HSAdmin
+  set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
+
 :pipes
   goto not_supported
 
@@ -189,6 +193,7 @@ goto :eof
   @echo   historyserver        run job history servers as a standalone daemon
   @echo   distcp ^<srcurl^> ^<desturl^> copy file or directories recursively
   @echo   archive -archiveName NAME -p ^<parent path^> ^<src^>* ^<dest^> create a hadoop archive
+  @echo   hsadmin              job history server admin interface
   @echo 
   @echo Most commands print help when invoked w/o parameters.