diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 7f911923132..dae19eea528 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -36,6 +36,9 @@ Release 2.0.1-alpha - UNRELEASED
     MAPREDUCE-4224. TestFifoScheduler throws 
     org.apache.hadoop.metrics2.MetricsException (Devaraj K via tgraves)
 
+    MAPREDUCE-3493. Add the default mapreduce.shuffle.port property
+    to mapred-default.xml (Madhukara Phatak via harsh)
+
 Release 2.0.0-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
index 34e5a7a9bb1..afb76e81801 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
@@ -1126,6 +1126,15 @@
   </description>
 </property>
 
+<property>
+  <name>mapreduce.shuffle.port</name>
+  <value>8080</value>
+  <description>Default port that the ShuffleHandler will run on. ShuffleHandler 
+   is a service run at the NodeManager to facilitate transfers of intermediate 
+   Map outputs to requesting Reducers.
+  </description>
+</property>
+
 <!--  Node health script variables -->
 
 <property>