diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3993f5efdb..9002e6a4d5 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -23,6 +23,8 @@ Trunk - Unreleased
 
     YARN-2436. [post-HADOOP-9902] yarn application help doesn't work (aw)
 
+    YARN-2525. yarn logs command gives error on trunk (Akira AJISAKA via aw)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn
index 371d23d712..12f7bb501b 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -99,7 +99,7 @@ case "${COMMAND}" in
     CLASS='org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer'
   ;;
   logs)
-    CLASS=org.apache.hadoop.yarn.logaggregation.LogDumper
+    CLASS=org.apache.hadoop.yarn.client.cli.LogsCLI
     hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS"
     YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
   ;;