diff --git a/.gitignore b/.gitignore
index 5ebd0bd78..5baf6b919 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 .clang_complete
 .gcc-flags.json
 .cache
-tasmota/user_config_override*
+tasmota/user_config_override.h
 build
 build_output
 firmware.map
diff --git a/platformio.ini b/platformio.ini
index 22259969c..c9eb6d5f4 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -109,7 +109,8 @@ build_flags               = ${esp_defaults.build_flags}
                             ; No exception code in firmware
                             -fno-exceptions
                             -lstdc++                            
-                            ; the following removes the 4-bytes alignment for PSTR()
+                            ; the following removes the 4-bytes alignment for PSTR(), waiting for a cleaner flag from Arduino Core
+                            -DPSTR\(s\)=\(__extension__\(\{static\ const\ char\ __c\[\]\ __attribute__\(\(__aligned__\(1\)\)\)\ __attribute__\(\(section\(\ \"\\\\\".irom0.pstr.\"\ __FILE__\ \".\"\ __STRINGIZE\(__LINE__\)\ \".\"\ \ __STRINGIZE\(__COUNTER__\)\ \"\\\\\"\,\ \\\\\"aSM\\\\\"\,\ \@progbits\,\ 1\ \#\"\)\)\)\ =\ \(s\)\;\ \&__c\[0\]\;\}\)\)
                             -DPSTR_ALIGN=1
                             ; restrict to minimal mime-types
                             -DMIMETYPE_MINIMAL