diff --git a/ChangeLog b/ChangeLog
index c20483f37..c6cb05495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2.6.0 () -
 
+- TW #2004 "shell" should not be expand to "exec tasksh"
+           Thanks to Arvedui
+- TW #2007 Compute number of current tasks correctly
+           Thanks to Janik Rabe
+- TW #2093 wrong order under projects command
+           Thanks to Beka, mrossinek.
+
+------ current release ---------------------------
+
+2.5.2 (2020-12-05) - b0c17d11639dc6e783befd89c8508f2abb9b4287
+
 - TD-64   sync conflict deleted all annotations of the task
           Thanks to Markus Beppler, Konstantin Vorobyev
 - TI-91   Timewarrior does not compile on DragonFly
@@ -69,8 +80,6 @@
           Thanks to Dan Callahan
 - TW-1903 grammar error -- There are 1 local changes.
           Thanks to Eric Hymowitz
-- TW-1904/#2093 Fix issue #1917 [TW-1904] wrong order under projects command #2093
-          Thanks to Beka, mrossinek.
 - TW-1906/#1919 sync sub-command is missing from task(1) manual page
           Thanks to rjc
 - TW-1910 unreachable statement
@@ -97,10 +106,6 @@
            Thanks to Kirill Bobyrev
 - TW #1922 Can't find export scripts
            Thanks to tom-doerr
-- TW #2004 "shell" should not be expand to "exec tasksh"
-           Thanks to Arvedui
-- TW #2007 Compute number of current tasks correctly
-           Thanks to Janik Rabe
 - TW #2020 reserved.lines is not affecting the burndown height
            Thanks to ad₋si
 - TW #2047 Exiting the task editor with an error code doesn't remove the lock file
@@ -115,6 +120,10 @@
            Thanks to Janik Rabe
 - #2132    JSON encode/decode string UDAs
            Thanks to Chad Phillips
+- #2176    How to get the full list of tags ?
+           Thanks to Adrien Lemaire
+- #2091    duration of task is set to a wrong and extremely big value
+           Thanks to Wray Zheng
 - Added 'juhannus' as a synonym for 'midsommarafton'
            Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
@@ -122,7 +131,8 @@
 - Removed deprecated 'alias._query' setting.
 - Fixed ambiguity in the esp-ESP localization
            Thanks to Fidel Mato
-- Changed behaviour of the 'new-uuid' verbosity option.
+- Deprecated the 'new-uuid' verbosity option, since its functionality can be
+  removed by merging with 'new-id'.
 - Correct a false-positive warning when a due date is removed and a wait is
   added.
 - Added 'QUARTER' virtual tag.
@@ -150,8 +160,10 @@
 - Removed compile-time language settings and I18N.
 - Workaround for alias grep=rg in fish
           Thanks to Lionel Miller.
+- Do not set CMP0037 on CMake 3.11.0 and above
+          Thanks to Janik Rabe
 
------- current release ---------------------------
+------ old releases ------------------------------
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
@@ -263,8 +275,6 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
           (thanks to Gordon Ball).
 
------- old releases ------------------------------
-
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
 
 - TW-20   Task edit loses annotation precision, causing journal updating code
diff --git a/NEWS b/NEWS
index 14eb7f68e..72a41da09 100644
--- a/NEWS
+++ b/NEWS
@@ -1,47 +1,25 @@
 
 New Features in Taskwarrior 2.6.0
 
-  - The 'QUARTER' virtual tag was added.
-  - Improved compatibility with SmartOS, OmniOS and OpenIndiana.
-  - New DOM references: annotations.count, tw.syncneeded, tw.program, tw.args,
-    tw.width, tw.height, tw.version.
-  - Renovated 'timesheet' command with a more compact report that accepts a
-    filter, and has a default filter showing the last four weeks of completed
-    and started tasks.
-  - The message telling you to sync now indicates how many local changes will be
-    synced.
   - The logic behind new-uuid verbosity option changed. New-uuid now overrides
     new-id if set and will cause Taskwarrior to display UUIDs instead of IDs
     for new tasks (machine friendly).
 
 New Commands in Taskwarrior 2.6.0
 
-  - The 'purge' command was added, which completely removes old tasks.
-  - Added new 'history.weekly', 'history.daily', 'ghistory.weekly',
-    'ghistory.daily' reports.
+  -
 
 New Configuration Options in Taskwarrior 2.6.0
 
-  - The 'default.scheduled' date/duration works just like 'default.due'.
-  - The 'report.timesheet.filter' setting controls the tasks shown by the
-    'timesheet' command.
+  -
 
 Newly Deprecated Features in Taskwarrior 2.6.0
 
-  - The 'DUETODAY' virtual tag is a synonym for the 'TODAY' virtual tag, and is
-    not needed.
-  - The use of alternate Boolean configuration settings is deprecated. Use values
-    "0" for off, and "1" for on.  Avoid used of "on", "off", "true", "t",
-    "false", "f", "yes", "y", "no", "n".
   - The 'PARENT' and 'CHILD' virtual tags are replaced by 'TEMPLATE' and 'INSTANCE'.
-  - The 'context.program', 'context.args', 'context.width' and 'context.height'
-    DOM references are deprecated, replaced by similarly-named 'tw.xxx'
-    references.
 
 Removed Features in 2.6.0
 
-  - Removed 'alias._query' default configuration.
-  - Translations are no longer supported.
+  -
 
 Known Issues