diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88c10be..ed663c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,151 @@
+# Mender Client 6.0.x
+
+| Repository | Version |
+| --- | --- |
+| [mender](https://github.com/mendersoftware/mender) | 5.1.x |
+| [mender-connect](https://github.com/mendersoftware/mender-connect) | 3.0.x |
+| [monitor-client](https://github.com/mendersoftware/monitor-client) | 1.5.x |
+| [mender-flash](https://github.com/mendersoftware/mender-flash) | 1.1.x |
+| [mender-configure-module](https://github.com/mendersoftware/mender-configure-module) | 1.1.x |
+| [mender-binary-delta](https://github.com/mendersoftware/mender-binary-delta) | 1.5.x |
+| [mender-container-modules](https://github.com/mendersoftware/mender-container-modules) | 1.0.x |
+
+## mender 5.1.x (2026-05-28)
+
+### 5.1.x - 2026-05-28
+
+
+#### Bug fixes
+
+
+- Don't retry status update on 413
+([ME-616](https://northerntech.atlassian.net/browse/ME-616)) ([e13437d](https://github.com/mendersoftware/mender/commit/e13437df32bb2a1e46e7c9abf706628728d699eb)) 
+
+
+
+
+- Handle first timestamp in deployment logs more carefully
+([MEN-9427](https://northerntech.atlassian.net/browse/MEN-9427)) ([68ab41e](https://github.com/mendersoftware/mender/commit/68ab41e3a70410690c6f0668e08e718e90816c25)) 
+
+
+
+
+
+
+  Depending on the system and build configuration, the timestamps
+  in logs can use lower (likely) or higher (unlikely) time
+  resolution than expected (nanoseconds). So in case of a
+  deployment failure with corrupted logs, when using the first
+  timestamp as a replacement in the extra `(THE ORIGINAL LOGS
+  CONTAINED INVALID ENTRIES)` log entry, care must be taken to make
+  sure the extra log entry still has a valid timestamp and that the
+  result is valid JSON.
+- Sort inventory generator scripts before running them
+([MEN-9635](https://northerntech.atlassian.net/browse/MEN-9635)) ([a5fcec1](https://github.com/mendersoftware/mender/commit/a5fcec17d2975553f54e7a70cfcec0042c78a1eb)) 
+
+
+
+
+
+
+  So that the results are consistent and don't depend on directory
+  iteration ordering.
+- Fail when device tier is invalid
+([ME-636](https://northerntech.atlassian.net/browse/ME-636)) ([590282f](https://github.com/mendersoftware/mender/commit/590282f3630acd9a6fd4b2109ca61b9662f72ab7)) 
+
+
+
+
+
+
+  DeviceTier is one of the configuration options but it is critical
+  for how device is recognized by the server. When we will fail
+  parsing it out of the configuration we should fail instead to
+  switching to the `standard` device tier.
+- Ensure limited permissions of mender-inventory-geo cache files
+([MEN-9752](https://northerntech.atlassian.net/browse/MEN-9752)) ([64584e2](https://github.com/mendersoftware/mender/commit/64584e2a3bc3f1874258dc21ddc84bfdeadedba9)) 
+
+
+
+
+
+
+  The /tmp/mender/inventory-geo cache file can potentially contain
+  sensitive data and there's no reason for it to have 644
+  permissions.
+  
+  By using `umask 077` we can easily ensure that any files created
+  by the script are only user/owner-accessible.
+
+
+
+
+#### Features
+
+
+- Large deployment logs are now trimmed to be accepted by the server
+([MEN-9415](https://northerntech.atlassian.net/browse/MEN-9415)) ([d870064](https://github.com/mendersoftware/mender/commit/d870064d0d75e1d73f3a6c4e11bea4ce4a351b9b)) 
+
+
+
+
+
+
+  Deployment logs larger than 1 MiB are rejected by the
+  server which leads to two issues:
+  
+  - excessive bandwith consumption when uploading such large logs
+    only to be thrown away, and
+  
+  - no deployment logs for particular device and particular failed
+    deployment available at the server at all.
+  
+  To prevent this, the client now trims large deployment logs and
+  only sends the biggest possible part of the logs from their end.
+
+## mender-connect 3.0.x (2026-02-27)
+
+No changelog entries found.
+
+## monitor-client 1.5.x (2026-02-23)
+
+No changelog entries found.
+
+## mender-flash 1.1.x (2026-02-27)
+
+No changelog entries found.
+
+## mender-configure-module 1.1.x (2026-05-28)
+
+No changelog entries found.
+
+## mender-binary-delta 1.5.x (2026-05-28)
+
+No changelog entries found.
+
+## mender-container-modules 1.0.x (2026-05-05)
+
+### 1.0.x - 2026-05-05
+
+
+#### Bug fixes
+
+
+- Cd into manifest dir beforing listing running containers
+([MEN-9641](https://northerntech.atlassian.net/browse/MEN-9641)) ([0aa83f8](https://github.com/mendersoftware/mender-container-modules/commit/0aa83f8bacad73c072e66531409873425bc6559a)) 
+
+
+
+
+
+  Fix an issue where docker-compose v1 can't find manifest files for a
+  composition because we don't cd into the manifest directory.
 
 ---
-## Older releases
 
-Previous to Mender Client 6.0, the release notes & changelog can be found in the pages for the individual components:
+# Older releases (pre Mender Client 6.0)
+
+The release notes & changelogs can be found in the pages for the individual components:
 
 * [mender](20.Mender-Client/docs.md)
 * [mender-connect](21.mender-connect/docs.md)
@@ -11,7 +154,7 @@ Previous to Mender Client 6.0, the release notes & changelog can be found in the
 * [mender-binary-delta](50.mender-binary-delta/docs.md)
 * [monitor-client](51.monitor-client/docs.md)
 
-The following release notes & changelog are for `mender` repository alone, prior to Mender Client 6.0
+The following release notes & changelogs are for the `mender` repository alone.
 
 ## mender 5.0.3