diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 0f58e03369..5a286812b4 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -188,6 +188,8 @@ Release 2.0.0 - UNRELEASED
     MAPREDUCE-4082. hadoop-mapreduce-client-app's mrapp-generated-classpath 
     file should not be in the module JAR (tucu)
 
+    MAPREDUCE-3916. various issues with running yarn proxyserver (devaraj via tucu)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/proxy/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 0a419a4488..686cb49210 100644
--- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -477,8 +477,7 @@
   
   <property>
     <description>The address for the web proxy as HOST:PORT, if this is not
-     given or if it matches yarn.resourcemanager.address then the proxy will
-     run as part of the RM</description>
+     given then the proxy will run as part of the RM</description>
      <name>yarn.web-proxy.address</name>
      <value/>
   </property>