diff --git a/core/.changelog.d/noissue.security b/core/.changelog.d/noissue.security
deleted file mode 100644
index 471cda3647..0000000000
--- a/core/.changelog.d/noissue.security
+++ /dev/null
@@ -1 +0,0 @@
-Disable all testnet coins from accessing Bitcoin paths.
diff --git a/core/.changelog.d/noissue.security.1 b/core/.changelog.d/noissue.security.1
deleted file mode 100644
index 87d7449830..0000000000
--- a/core/.changelog.d/noissue.security.1
+++ /dev/null
@@ -1 +0,0 @@
-Restrict BIP-45 paths to Bitcoin and coins with strong replay protection.
diff --git a/core/.changelog.d/noissue.security.2 b/core/.changelog.d/noissue.security.2
deleted file mode 100644
index 6c34e3650a..0000000000
--- a/core/.changelog.d/noissue.security.2
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that all testnet coins use SLIP-44 coin type 1.
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 7b5816a3c5..9a47d382ae 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -26,6 +26,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix red screen on shutdown.  [#1658]
 - Empty passphrase is properly cached in Cardano functions  [#1659]
 
+### Security
+- Ensure that all testnet coins use SLIP-44 coin type 1.
+- Disable all testnet coins from accessing Bitcoin paths.
+- Restrict BIP-45 paths to Bitcoin and coins with strong replay protection.
+
 
 ## 2.4.0 [9th June 2021]
 
diff --git a/legacy/firmware/.changelog.d/1660.fixed b/legacy/firmware/.changelog.d/1660.fixed
deleted file mode 100644
index badda7e786..0000000000
--- a/legacy/firmware/.changelog.d/1660.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Allow non-standard paths used by Unchained Capital, Green Address and Casa.
diff --git a/legacy/firmware/.changelog.d/noissue.security b/legacy/firmware/.changelog.d/noissue.security
deleted file mode 100644
index 9e933c3644..0000000000
--- a/legacy/firmware/.changelog.d/noissue.security
+++ /dev/null
@@ -1 +0,0 @@
-Don't show addresses that have an unrecognized path.
diff --git a/legacy/firmware/.changelog.d/noissue.security.1 b/legacy/firmware/.changelog.d/noissue.security.1
deleted file mode 100644
index 471cda3647..0000000000
--- a/legacy/firmware/.changelog.d/noissue.security.1
+++ /dev/null
@@ -1 +0,0 @@
-Disable all testnet coins from accessing Bitcoin paths.
diff --git a/legacy/firmware/.changelog.d/noissue.security.2 b/legacy/firmware/.changelog.d/noissue.security.2
deleted file mode 100644
index 6c34e3650a..0000000000
--- a/legacy/firmware/.changelog.d/noissue.security.2
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that all testnet coins use SLIP-44 coin type 1.
diff --git a/legacy/firmware/.changelog.d/noissue.security.3 b/legacy/firmware/.changelog.d/noissue.security.3
deleted file mode 100644
index 7f1adb70b6..0000000000
--- a/legacy/firmware/.changelog.d/noissue.security.3
+++ /dev/null
@@ -1 +0,0 @@
-Restrict the BIP-32 path ranges of account, change and address_index fields.
diff --git a/legacy/firmware/.changelog.d/noissue.security.4 b/legacy/firmware/.changelog.d/noissue.security.4
deleted file mode 100644
index 87d7449830..0000000000
--- a/legacy/firmware/.changelog.d/noissue.security.4
+++ /dev/null
@@ -1 +0,0 @@
-Restrict BIP-45 paths to Bitcoin and coins with strong replay protection.
diff --git a/legacy/firmware/CHANGELOG.md b/legacy/firmware/CHANGELOG.md
index d27d79375f..cf8eb65d10 100644
--- a/legacy/firmware/CHANGELOG.md
+++ b/legacy/firmware/CHANGELOG.md
@@ -10,6 +10,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Removed support for Firo  [#1647]
 - Removed support for Hatch  [#1650]
 
+### Fixed
+- Allow non-standard paths used by Unchained Capital, Green Address and Casa.  [#1660]
+
+### Security
+- Ensure that all testnet coins use SLIP-44 coin type 1.
+- Restrict BIP-45 paths to Bitcoin and coins with strong replay protection.
+- Don't show addresses that have an unrecognized path.
+- Disable all testnet coins from accessing Bitcoin paths.
+- Restrict the BIP-32 path ranges of `account`, `change` and `address_index` fields.
+
 
 ## 1.10.1 [9th June 2021]
 
@@ -400,3 +410,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#1627]: https://github.com/trezor/trezor-firmware/issues/1627
 [#1647]: https://github.com/trezor/trezor-firmware/issues/1647
 [#1650]: https://github.com/trezor/trezor-firmware/issues/1650
+[#1660]: https://github.com/trezor/trezor-firmware/issues/1660