diff --git a/ChangeLog b/ChangeLog
index ad96ac656..8ba22d5df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,32 +4,50 @@ ChangeLog
 version 2.4.0 (2017-0X-XX)
 * OAuth2 authentication support
 * Sharing: Add support for multiple public link shares (#5655)
-* Sharing: Add option to copy/email direct links (#5627)
+* Sharing: Add option to copy/email direct links (#5627, #5023)
+* Sharing: Add option "show file listing" (#5837)
 * Sharing: Show warning that links are public
 * Sharing: Many UI improvements
+* Sharing: Make "can edit" partially checked sometimes #5642
 * Wizards: Never propose an existing folder for syncing (#5597)
 * Wizard: Don't show last page anymore, go to settings directly (#5726)
 * Settings Dialog: Display the user server avatar
 * Selective Sync: Open sub folder context menu (#5596)
 * Selective Sync: Skip excluded folders when reading db
-* Selective Sync: SelectiveSync: Remove local files of unselected folder despite other modified files (#5783)
-* Exclude list: remove .htaccess
-* Detect maintenance mode (#4485)
+* Selective Sync: Remove local files of unselected folder despite other modified files (#5783)
+* Exclude list: remove .htaccess form list of excluded files
+* Sync Issues: More functional error view including filters and conflicts #5516
 * Discovery: Increase the MAX_DEPTH and show deep folders as ignored
 * Downloads: Remove empty temporary if disk space full (#5746)
 * Downloads: Re-trigger folder discovery on 404
 * When creating explorer favorite use more specific windows functions (#5690)
+* AccountSettings: Triggering log in re-ask about previously rejected certificates #5819
 * Added owncloudcmd bandwidth limit parameter (#5707)
 * AccountSettings: Sync with clean discovery on Ctrl-F6 (#5666)
-* Dynamic size of chunks in chunked uploads for improved big file upload performance
-* ShareDialog: Make "can edit" partially checked sometimes #5642
-* Require Qt5
-* Switch 3rdparty/json usage to Qt5's QJson (#5710)
+* Sync: Dynamic sizing of chunks in chunked uploads for improved big file upload performance
+* Sync: Introduce overall errors that are not tied to a file #5746
+* Sync: Better messaging for 507 Insufficient Storage #5537
+* Sync: Create conflicts by comparing the hash of files with identical mtime/size #5589
+* Sync: Blacklist: Don't let errors become warnings #5516
+* macOS: Finder sidebar icon #296
 * Reduce memory usage
+* Fix at least one memory leak
 * Documentation improvements
 * Logging improvements (with Qt logging categories), new --logdebug parameter
 * Harmonize source code style with clang-format
 * Crash fixes
+* Test improvements
+* Windows Overlays: Potential hang fixes
+* Small UI layout fixes
+* Maintenance Mode: Detect maintenance mode (#4485)
+* Maintenance Mode: Add a 1 to 5 min reconnection delay #5872
+* HTTP: Send a unique X-Request-ID with each request #5853
+* HTTP: Support HTTP2 when built and running with Qt 5.9.x (Official packages still on Qt 5.6.x)
+* owncloudcmd: Don't start if connection or auth fails #5692
+* Overlays: Consider also the "shared by me" as shared (#4788)
+* Switch 3rdparty/json usage to Qt5's QJson (#5710)
+* OpenSSL: Don't require directly, only via Qt
+* Remove iconv dependency, use Qt for file system locale encoding/decoding (emoji filename support on macOS)
 
 version 2.3.3 (2017-07-XX)
 * Chunking NG: Don't use old chunking on new DAV endpoint (#5855)