about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3dafcec2b2..8f0a93aceb 100644
--- a/Makefile
+++ b/Makefile
@@ -673,7 +673,7 @@ TAGS:
 
 generated := $(generated) stubs.h
 
-files-for-dist := README INSTALL configure ChangeLog NEWS
+files-for-dist := README INSTALL configure NEWS
 
 # Regenerate stuff, then error if these things are not committed yet.
 dist-prepare: $(files-for-dist)
diff --git a/NEWS b/NEWS
index b85989ec3d..0ecee6c13b 100644
--- a/NEWS
+++ b/NEWS
@@ -104,6 +104,10 @@ Changes to build and runtime requirements:
 * It is no longer necessary to have recent Linux kernel headers to build
   working (non-stub) system call wrappers.
 
+* The ChangeLog file is no longer present in the toplevel directory of the
+  source tree.  ChangeLog files are located in the ChangeLog.old directory as
+  ChangeLog.N where the highest N has the latest entries.
+
 Security related changes:
 
   CVE-2019-19126: ld.so failed to ignore the LD_PREFER_MAP_32BIT_EXEC