diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index e0428ca327..dafd6c6b14 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -350,10 +350,7 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11156. DelegateToFileSystem should implement
     getFsStatus(final Path f). (Zhihai Xu via wang)
 
-    HDFS-7186. Document the "hadoop trace" command. (Masatake Iwasaki via Colin
-    P. McCabe)
-
-    Improve error message in Shell#runCommand on OutOfMemoryError.
+    HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError.
     (Yongjun Zhang via wang)
 
   OPTIMIZATIONS
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 9e76617351..fb2e419d9b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -368,6 +368,9 @@ Release 2.7.0 - UNRELEASED
 
     HDFS-7055. Add tracing to DFSInputStream (cmccabe)
 
+    HDFS-7186. Document the "hadoop trace" command. (Masatake Iwasaki via Colin
+    P. McCabe)
+
   OPTIMIZATIONS
 
   BUG FIXES