diff --git a/legacy/bootloader/.changelog.d/1642.security b/legacy/bootloader/.changelog.d/1642.security
deleted file mode 100644
index cc5ff3093..000000000
--- a/legacy/bootloader/.changelog.d/1642.security
+++ /dev/null
@@ -1 +0,0 @@
-Avoid accidental build with broken stack protector
diff --git a/legacy/bootloader/.changelog.d/1884.fixed b/legacy/bootloader/.changelog.d/1884.fixed
deleted file mode 100644
index 35202af07..000000000
--- a/legacy/bootloader/.changelog.d/1884.fixed
+++ /dev/null
@@ -1 +0,0 @@
-Compress firmware verification coordinates to be able link bootloader into preallocated space.
diff --git a/legacy/bootloader/.changelog.d/2231.added b/legacy/bootloader/.changelog.d/2231.added
deleted file mode 100644
index 2579a6a77..000000000
--- a/legacy/bootloader/.changelog.d/2231.added
+++ /dev/null
@@ -1 +0,0 @@
-Bootloader will report version of installed firmware.
diff --git a/legacy/bootloader/.changelog.d/noissue.security b/legacy/bootloader/.changelog.d/noissue.security
deleted file mode 100644
index a18706c01..000000000
--- a/legacy/bootloader/.changelog.d/noissue.security
+++ /dev/null
@@ -1 +0,0 @@
-Erase storage when downgrading below fix_version.
diff --git a/legacy/bootloader/CHANGELOG.md b/legacy/bootloader/CHANGELOG.md
index 8c3a9d756..ca0507070 100644
--- a/legacy/bootloader/CHANGELOG.md
+++ b/legacy/bootloader/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/).
 
+## 1.11.0 [May 2022]
+
+### Added
+- Bootloader will report version of installed firmware.  [#2231]
+
+### Fixed
+- Compress firmware verification coordinates to be able link bootloader into preallocated space.  [#1884]
+
+### Security
+- Erase storage when downgrading below fix_version.
+- Avoid accidental build with broken stack protector  [#1642]
+
+
 ## 1.10.0 [May 2021]
 
 ### Added
@@ -112,3 +125,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Initial import of code.
 
 [#1461]: https://github.com/trezor/trezor-firmware/pull/1461
+[#1642]: https://github.com/trezor/trezor-firmware/pull/1642
+[#1884]: https://github.com/trezor/trezor-firmware/pull/1884
+[#2231]: https://github.com/trezor/trezor-firmware/pull/2231
diff --git a/legacy/firmware/bl_check.c b/legacy/firmware/bl_check.c
index d38cb8fa5..eeb5eb225 100644
--- a/legacy/firmware/bl_check.c
+++ b/legacy/firmware/bl_check.c
@@ -132,6 +132,12 @@ static int known_bootloader(int r, const uint8_t *hash) {
              "\xb9\xc7\xf6\x03\xcd\xc7\x30\xe7\x30\x78\x50\xa3\xf4\xd6\x2a\x5c",
              32))
     return 1;  // 1.10.0 shipped with fw 1.10.0
+  if (0 ==
+      memcmp(hash,
+             "\xfa\x12\xa4\x4f\xa0\x5f\xd1\xd2\x05\x39\x35\x8b\x54\xf3\x01\xce"
+             "\xe4\xc3\x21\x9c\x9f\x1b\xb3\xa5\x77\x2f\xfd\x60\x9a\xf9\xe8\xe2",
+             32))
+    return 1;  // 1.11.0 shipped with fw 1.11.1
   return 0;
 }
 #endif
diff --git a/legacy/firmware/bootloader.dat b/legacy/firmware/bootloader.dat
index 604efd795..ac9d56f23 100644
Binary files a/legacy/firmware/bootloader.dat and b/legacy/firmware/bootloader.dat differ