diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1ff1fcb388..8bc614d64a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -15,6 +15,8 @@ Trunk - Unreleased
 
     YARN-2437. start-yarn.sh/stop-yarn should give info (Varun Saxena via aw)
 
+    YARN-2796. deprecate sbin/yarn-daemon.sh (aw)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh b/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh
index b15448bdbc..75294fe2df 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh
@@ -42,5 +42,8 @@ fi
 daemonmode=$1
 shift
 
+hadoop_error "WARNING: Use of this script to ${daemonmode} YARN daemons is deprecated."
+hadoop_error "WARNING: Attempting to execute replacement \"yarn --daemon ${daemonmode}\" instead."
+
 exec "${HADOOP_YARN_HOME}/bin/yarn" \
 --config "${HADOOP_CONF_DIR}" --daemon "${daemonmode}" "$@"