diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fbe13e93f5..c2056d9994a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Table of Contents
 
+* [Changelog for unreleased](#changelog-for-owncloud-android-client-unreleased-unreleased)
+* [Changelog for 4.2.1](#changelog-for-owncloud-android-client-421-2024-02-22)
 * [Changelog for 4.2.0](#changelog-for-owncloud-android-client-420-2024-02-12)
 * [Changelog for 4.1.1](#changelog-for-owncloud-android-client-411-2023-10-18)
 * [Changelog for 4.1.0](#changelog-for-owncloud-android-client-410-2023-08-23)
@@ -18,6 +20,56 @@
 * [Changelog for 2.18.1](#changelog-for-owncloud-android-client-2181-2021-07-20)
 * [Changelog for 2.18.0](#changelog-for-owncloud-android-client-2180-2021-05-24)
 * [Changelog for 2.17 versions and below](#changelog-for-217-versions-and-below)
+# Changelog for ownCloud Android Client [unreleased] (UNRELEASED)
+
+The following sections list the changes in ownCloud Android Client unreleased relevant to
+ownCloud admins and users.
+
+[unreleased]: https://github.com/owncloud/android/compare/v4.2.1...master
+
+## Summary
+
+* Change - Upgrade minimum SDK version to Android 7.0 (v24): [#4230](https://github.com/owncloud/android/issues/4230)
+* Enhancement - Unit tests for repository classes - Part 1: [#4232](https://github.com/owncloud/android/issues/4232)
+
+## Details
+
+* Change - Upgrade minimum SDK version to Android 7.0 (v24): [#4230](https://github.com/owncloud/android/issues/4230)
+
+   The minimum Android version will be Android 7.0 Nougat (API 24). The application
+   will no longer support previous versions.
+
+   https://github.com/owncloud/android/issues/4230
+   https://github.com/owncloud/android/pull/4299
+
+* Enhancement - Unit tests for repository classes - Part 1: [#4232](https://github.com/owncloud/android/issues/4232)
+
+   Unit tests for OCAppRegistryRepository, OCAuthenticationRepository and
+   OCCapabilityRepository classes have been completed.
+
+   https://github.com/owncloud/android/issues/4232
+   https://github.com/owncloud/android/pull/4281
+
+# Changelog for ownCloud Android Client [4.2.1] (2024-02-22)
+
+The following sections list the changes in ownCloud Android Client 4.2.1 relevant to
+ownCloud admins and users.
+
+[4.2.1]: https://github.com/owncloud/android/compare/v4.2.0...v4.2.1
+
+## Summary
+
+* Bugfix - Some crashes in 4.2.0: [#4318](https://github.com/owncloud/android/issues/4318)
+
+## Details
+
+* Bugfix - Some crashes in 4.2.0: [#4318](https://github.com/owncloud/android/issues/4318)
+
+   Several crashes reported by Play Console in version 4.2.0 have been fixed.
+
+   https://github.com/owncloud/android/issues/4318
+   https://github.com/owncloud/android/pull/4323
+
 # Changelog for ownCloud Android Client [4.2.0] (2024-02-12)
 
 The following sections list the changes in ownCloud Android Client 4.2.0 relevant to