diff --git a/CHANGES b/CHANGES
new file mode 100644
index 000000000..e0c84e9b3
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,20 @@
+Bugs mentioned as #<N> are referencing github issues
+at https://github.com/ygrek/mldonkey/issues
+
+Changelog
+=========
+
+2017/01/22:
+* BT: better diagnostics of wrong udp tracker reply
+* BT/DHT: update public router addresses
+* fix buffer overflows in DNS resolution
+* update default blocklist url (Closes #4)
+* fix build with OCaml 4.02 (closes #6)
++ extend command conditions (pause, resume, priority) (ref #9)
+* Fix compilation errors with gcc5 (closes #12) (Christopher Meng)
+* BT: relaxed parsing of bencoded numbers
+* fix build with libminiupnpc 1.9 (closes #13)
+* escape filename based on filesystem, not OS type
+* Fix compilation with OCaml 4.03.0 (Bastien Dejean)
+
+See distrib/ChangeLog for older entries
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e8f2c4d62..000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-See the distrib/ChangeLog file.
-
-See also the distrib/TODO file :)
diff --git a/distrib/ChangeLog b/distrib/ChangeLog
index c1622bfc1..bdd204bd8 100644
--- a/distrib/ChangeLog
+++ b/distrib/ChangeLog
@@ -14,6 +14,9 @@ http://mldonkey.sourceforge.net/Windows#MinGW_Installation
 ChangeLog
 =========
 
+2017/01/22: ygrek
+Changes after 3.1.5 are in CHANGES file in the project root directory
+
 2014/03/22: version 3.1.5 = tag release-3-1-5
 8415: Revert patch #8328 to fix GTK2 gui's compilation (ygrek)