diff --git a/core/.changelog.d/1167.changed b/core/.changelog.d/1167.changed
deleted file mode 100644
index 12c445cfd..000000000
--- a/core/.changelog.d/1167.changed
+++ /dev/null
@@ -1 +0,0 @@
-Support PIN of unlimited length.
diff --git a/core/.changelog.d/1249.added b/core/.changelog.d/1249.added
deleted file mode 100644
index f566a063d..000000000
--- a/core/.changelog.d/1249.added
+++ /dev/null
@@ -1 +0,0 @@
-Decred staking.
diff --git a/core/.changelog.d/1404.added b/core/.changelog.d/1404.added
deleted file mode 100644
index 0f0632650..000000000
--- a/core/.changelog.d/1404.added
+++ /dev/null
@@ -1 +0,0 @@
-Locking the device by holding finger on the homescreen for 2.5 seconds.
diff --git a/core/.changelog.d/1491.changed b/core/.changelog.d/1491.changed
deleted file mode 100644
index caa2c13a6..000000000
--- a/core/.changelog.d/1491.changed
+++ /dev/null
@@ -1 +0,0 @@
-Allow decreasing the output value in RBF transactions.
diff --git a/core/.changelog.d/1502.changed b/core/.changelog.d/1502.changed
deleted file mode 100644
index 035c8cd3a..000000000
--- a/core/.changelog.d/1502.changed
+++ /dev/null
@@ -1 +0,0 @@
-Cardano: Allow stake pool registrations with zero margin.
diff --git a/core/.changelog.d/1510.changed b/core/.changelog.d/1510.changed
deleted file mode 100644
index 86b5e4484..000000000
--- a/core/.changelog.d/1510.changed
+++ /dev/null
@@ -1 +0,0 @@
-Cardano: Assets are now shown as CIP-0014.
diff --git a/core/.changelog.d/1518.added b/core/.changelog.d/1518.added
deleted file mode 100644
index 65957fdfc..000000000
--- a/core/.changelog.d/1518.added
+++ /dev/null
@@ -1 +0,0 @@
-Public key to ECDHSessionKey.
diff --git a/core/.changelog.d/1540.added b/core/.changelog.d/1540.added
deleted file mode 100644
index 736131c0b..000000000
--- a/core/.changelog.d/1540.added
+++ /dev/null
@@ -1 +0,0 @@
-Rust FFI for MicroPython.
diff --git a/core/.changelog.d/1554.changed b/core/.changelog.d/1554.changed
deleted file mode 100644
index 7a2b2ac82..000000000
--- a/core/.changelog.d/1554.changed
+++ /dev/null
@@ -1 +0,0 @@
-Random delays use ChaCha-based DRBG instead of HMAC-DRBG.
diff --git a/core/.changelog.d/1565.changed b/core/.changelog.d/1565.changed
deleted file mode 100644
index a0e98d294..000000000
--- a/core/.changelog.d/1565.changed
+++ /dev/null
@@ -1 +0,0 @@
-Reduce memory fragmentation by clearing memory after every workflow.
diff --git a/core/.changelog.d/24.fixed b/core/.changelog.d/24.fixed
deleted file mode 100644
index 4679500c4..000000000
--- a/core/.changelog.d/24.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Import errors on T1 startup.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 7b02fcfb7..700f3f79c 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.4.0 [24th May 2021]
+
+### Added
+- Decred staking.  [#1249]
+- Locking the device by holding finger on the homescreen for 2.5 seconds.  [#1404]
+- Public key to ECDHSessionKey.  [#1518]
+- Rust FFI for MicroPython.  [#1540]
+
+### Changed
+- Support PIN of unlimited length.  [#1167]
+- Allow decreasing the output value in RBF transactions.  [#1491]
+- Cardano: Allow stake pool registrations with zero margin.  [#1502]
+- Cardano: Assets are now shown as CIP-0014.  [#1510]
+- Random delays use ChaCha-based DRBG instead of HMAC-DRBG.  [#1554]
+- Reduce memory fragmentation by clearing memory after every workflow.  [#1565]
+- Update some FIDO icons.  [#1456]
+
+### Fixed
+- Import errors on T1 startup.  [#24]
+- Improve wording when showing multisig XPUBs.  [#1431]
+
+
 ## 2.3.6 [15th February 2021]
 
 ### Added
@@ -313,6 +335,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - First public release.
 
+[#24]: https://github.com/trezor/trezor-firmware/issues/24
 [#379]: https://github.com/trezor/trezor-firmware/issues/379
 [#800]: https://github.com/trezor/trezor-firmware/issues/800
 [#948]: https://github.com/trezor/trezor-firmware/issues/948
@@ -338,6 +361,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#1139]: https://github.com/trezor/trezor-firmware/issues/1139
 [#1159]: https://github.com/trezor/trezor-firmware/issues/1159
 [#1165]: https://github.com/trezor/trezor-firmware/pull/1165
+[#1167]: https://github.com/trezor/trezor-firmware/issues/1167
 [#1173]: https://github.com/trezor/trezor-firmware/pull/1173
 [#1184]: https://github.com/trezor/trezor-firmware/issues/1184
 [#1188]: https://github.com/trezor/trezor-firmware/issues/1188
@@ -345,6 +369,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#1193]: https://github.com/trezor/trezor-firmware/issues/1193
 [#1206]: https://github.com/trezor/trezor-firmware/issues/1206
 [#1246]: https://github.com/trezor/trezor-firmware/issues/1246
+[#1249]: https://github.com/trezor/trezor-firmware/issues/1249
 [#1271]: https://github.com/trezor/trezor-firmware/issues/1271
 [#1292]: https://github.com/trezor/trezor-firmware/issues/1292
 [#1322]: https://github.com/trezor/trezor-firmware/issues/1322
@@ -355,5 +380,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#1384]: https://github.com/trezor/trezor-firmware/issues/1384
 [#1399]: https://github.com/trezor/trezor-firmware/issues/1399
 [#1402]: https://github.com/trezor/trezor-firmware/pull/1402
+[#1404]: https://github.com/trezor/trezor-firmware/issues/1404
 [#1415]: https://github.com/trezor/trezor-firmware/pull/1415
+[#1431]: https://github.com/trezor/trezor-firmware/pull/1431
+[#1456]: https://github.com/trezor/trezor-firmware/pull/1456
 [#1467]: https://github.com/trezor/trezor-firmware/issues/1467
+[#1491]: https://github.com/trezor/trezor-firmware/issues/1491
+[#1502]: https://github.com/trezor/trezor-firmware/issues/1502
+[#1510]: https://github.com/trezor/trezor-firmware/issues/1510
+[#1518]: https://github.com/trezor/trezor-firmware/issues/1518
+[#1540]: https://github.com/trezor/trezor-firmware/issues/1540
+[#1554]: https://github.com/trezor/trezor-firmware/issues/1554
+[#1565]: https://github.com/trezor/trezor-firmware/issues/1565