diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29d06b990..5717a333a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 ### Breaking Changed
 
 ### Changed
+- ESP32 compiler option from `target-align` to `no-target-align` (#21407)
 
 ### Fixed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 59e17ef8f..7e9b6532c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -125,6 +125,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 ### Breaking Changed
 
 ### Changed
+- ESP32 compiler option from `target-align` to `no-target-align` [#21407](https://github.com/arendst/Tasmota/issues/21407)
 
 ### Fixed