diff --git a/common/defs/ethereum/released-definitions-timestamp.txt b/common/defs/ethereum/released-definitions-timestamp.txt
index 7842b9d39..5d703ab7b 100644
--- a/common/defs/ethereum/released-definitions-timestamp.txt
+++ b/common/defs/ethereum/released-definitions-timestamp.txt
@@ -1 +1 @@
-2023-11-01T12:53:06+00:00
+2023-11-30T09:48:08+00:00
diff --git a/core/.changelog.d/3246.changed b/core/.changelog.d/3246.changed
deleted file mode 100644
index da1bed17e..000000000
--- a/core/.changelog.d/3246.changed
+++ /dev/null
@@ -1 +0,0 @@
-Always display Ethereum fees in Gwei.
diff --git a/core/.changelog.d/3359.added b/core/.changelog.d/3359.added
deleted file mode 100644
index d2392f649..000000000
--- a/core/.changelog.d/3359.added
+++ /dev/null
@@ -1 +0,0 @@
-Added Solana support
diff --git a/core/.changelog.d/3411.fixed b/core/.changelog.d/3411.fixed
deleted file mode 100644
index 2a112d3e4..000000000
--- a/core/.changelog.d/3411.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Fix invalid encoding of signatures from Optiga.
diff --git a/core/.changelog.d/3424.fixed b/core/.changelog.d/3424.fixed
deleted file mode 100644
index a212aacbf..000000000
--- a/core/.changelog.d/3424.fixed
+++ /dev/null
@@ -1 +0,0 @@
-[T2B1] Re-added missing address confirmation screens.
diff --git a/core/CHANGELOG.T2B1.md b/core/CHANGELOG.T2B1.md
index 8b7eeb6fe..ee7c7fb68 100644
--- a/core/CHANGELOG.T2B1.md
+++ b/core/CHANGELOG.T2B1.md
@@ -4,7 +4,20 @@ 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.6.3] (2nd November 2023)
+## [2.6.4] (20th December 2023)
+
+### Added
+- Added Solana support.  [#3359]
+
+### Changed
+- Always display Ethereum fees in Gwei.  [#3246]
+
+### Fixed
+- Fix invalid encoding of signatures from Optiga.  [#3411]
+- Re-added missing address confirmation screens.  [#3424]
+
+
+## [2.6.3] (15th November 2023)
 
 ### Added
 - Support interaction-less upgrade.  [#2919]
@@ -808,8 +821,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218
 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237
 [#3242]: https://github.com/trezor/trezor-firmware/pull/3242
+[#3246]: https://github.com/trezor/trezor-firmware/pull/3246
 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255
 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256
 [#3296]: https://github.com/trezor/trezor-firmware/pull/3296
 [#3311]: https://github.com/trezor/trezor-firmware/pull/3311
+[#3359]: https://github.com/trezor/trezor-firmware/pull/3359
 [#3377]: https://github.com/trezor/trezor-firmware/pull/3377
+[#3411]: https://github.com/trezor/trezor-firmware/pull/3411
+[#3424]: https://github.com/trezor/trezor-firmware/pull/3424
diff --git a/core/CHANGELOG.T2T1.md b/core/CHANGELOG.T2T1.md
index e258cf58d..5d4cadeea 100644
--- a/core/CHANGELOG.T2T1.md
+++ b/core/CHANGELOG.T2T1.md
@@ -4,7 +4,16 @@ 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.6.3] (2nd November 2023)
+## [2.6.4] (20th December 2023)
+
+### Added
+- Added Solana support.  [#3359]
+
+### Changed
+- Always display Ethereum fees in Gwei.  [#3246]
+
+
+## [2.6.3] (15th November 2023)
 
 ### Added
 - Support interaction-less upgrade.  [#2919]
@@ -808,8 +817,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218
 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237
 [#3242]: https://github.com/trezor/trezor-firmware/pull/3242
+[#3246]: https://github.com/trezor/trezor-firmware/pull/3246
 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255
 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256
 [#3296]: https://github.com/trezor/trezor-firmware/pull/3296
 [#3311]: https://github.com/trezor/trezor-firmware/pull/3311
+[#3359]: https://github.com/trezor/trezor-firmware/pull/3359
 [#3377]: https://github.com/trezor/trezor-firmware/pull/3377
+[#3411]: https://github.com/trezor/trezor-firmware/pull/3411
+[#3424]: https://github.com/trezor/trezor-firmware/pull/3424
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 42f23b511..80d48b580 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -4,6 +4,19 @@ 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.6.4] (20th December 2023)
+
+### Added
+- Added Solana support.  [#3359]
+
+### Changed
+- Always display Ethereum fees in Gwei.  [#3246]
+
+### Fixed
+- Fix invalid encoding of signatures from Optiga.  [#3411]
+- [T2B1] Re-added missing address confirmation screens.  [#3424]
+
+
 ## [2.6.3] (15th November 2023)
 
 ### Added
@@ -813,8 +826,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [#3218]: https://github.com/trezor/trezor-firmware/pull/3218
 [#3237]: https://github.com/trezor/trezor-firmware/pull/3237
 [#3242]: https://github.com/trezor/trezor-firmware/pull/3242
+[#3246]: https://github.com/trezor/trezor-firmware/pull/3246
 [#3255]: https://github.com/trezor/trezor-firmware/pull/3255
 [#3256]: https://github.com/trezor/trezor-firmware/pull/3256
 [#3296]: https://github.com/trezor/trezor-firmware/pull/3296
 [#3311]: https://github.com/trezor/trezor-firmware/pull/3311
+[#3359]: https://github.com/trezor/trezor-firmware/pull/3359
 [#3377]: https://github.com/trezor/trezor-firmware/pull/3377
+[#3411]: https://github.com/trezor/trezor-firmware/pull/3411
+[#3424]: https://github.com/trezor/trezor-firmware/pull/3424
diff --git a/core/src/apps/ethereum/definitions_constants.py b/core/src/apps/ethereum/definitions_constants.py
index 81c414df7..c4e153101 100644
--- a/core/src/apps/ethereum/definitions_constants.py
+++ b/core/src/apps/ethereum/definitions_constants.py
@@ -9,7 +9,7 @@ PUBLIC_KEYS = (
     b"\xb8\xd2\xb2\x1d\xe2\x71\x24\xf0\x51\x1f\x90\x3a\xe7\xe6\x0e\x07\x96\x18\x10\xa0\xb8\xf2\x8e\xa7\x55\xfa\x50\x36\x7a\x8a\x2b\x8b",
 )
 
-MIN_DATA_VERSION = 1698843186
+MIN_DATA_VERSION = 1701337688
 FORMAT_VERSION = b"trzd1"
 
 if __debug__: