diff --git a/core/.changelog.d/1642.security b/core/.changelog.d/1642.security
new file mode 100644
index 000000000..cc5ff3093
--- /dev/null
+++ b/core/.changelog.d/1642.security
@@ -0,0 +1 @@
+Avoid accidental build with broken stack protector
diff --git a/core/embed/bootloader/.changelog.d/1642.security b/core/embed/bootloader/.changelog.d/1642.security
new file mode 100644
index 000000000..cc5ff3093
--- /dev/null
+++ b/core/embed/bootloader/.changelog.d/1642.security
@@ -0,0 +1 @@
+Avoid accidental build with broken stack protector
diff --git a/legacy/bootloader/.changelog.d/1642.security b/legacy/bootloader/.changelog.d/1642.security
new file mode 100644
index 000000000..cc5ff3093
--- /dev/null
+++ b/legacy/bootloader/.changelog.d/1642.security
@@ -0,0 +1 @@
+Avoid accidental build with broken stack protector
diff --git a/legacy/bootloader/.gitignore b/legacy/bootloader/.gitignore
index e0baf9ab7..8877147c2 100644
--- a/legacy/bootloader/.gitignore
+++ b/legacy/bootloader/.gitignore
@@ -1,6 +1,7 @@
 *.o
 *.a
 *.d
+!.changelog.d
 *.bin
 *.elf
 *.hex
diff --git a/legacy/firmware/.changelog.d/1642.security b/legacy/firmware/.changelog.d/1642.security
new file mode 100644
index 000000000..cc5ff3093
--- /dev/null
+++ b/legacy/firmware/.changelog.d/1642.security
@@ -0,0 +1 @@
+Avoid accidental build with broken stack protector