diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 89c68c062..14e82b6f3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -65,10 +65,12 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Fix ``status 13`` json message
 - Fix Shelly 2.5 higher temperature regression from 8.2.0.1 (#7991)
 - Change replace ArduinoJson with JSMN for JSON parsing
+- Change ``WakeUp`` uses 256 steps instead of 100 (#9241)
 - Add command ``SetOption110 1`` to disable Zigbee auto-config when pairing new devices
 - Add command ``SetOption111 1`` to enable frequency output for buzzer GPIO (#8994)
 - Add command ``SetOption112 1`` to enable friendly name in zigbee topic (use with SetOption89)
 - Add ``#define USE_MQTT_AWS_IOT_LIGHT`` for password based AWS IoT authentication
+- Add ``#define MQTT_LWT_OFFLINE`` and ``#define MQTT_LWT_ONLINE`` to user_config.h (#9395)
 - Add new shutter modes (#9244)
 - Add Zigbee auto-config when pairing
 - Add support for MLX90640 IR array temperature sensor by Christian Baars
diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 698888f81..f555c1324 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -12,14 +12,15 @@
 - Fix ``status 13`` json message
 - Fix Shelly 2.5 higher temperature regression from 8.2.0.1 (#7991)
 - Change replace ArduinoJson with JSMN for JSON parsing
+- Change ``WakeUp`` uses 256 steps instead of 100 (#9241)
 - Add command ``SetOption110 1`` to disable Zigbee auto-config when pairing new devices
 - Add command ``SetOption111 1`` to enable frequency output for buzzer GPIO (#8994)
 - Add command ``SetOption112 1`` to enable friendly name in zigbee topic (use with SetOption89)
 - Add ``#define USE_MQTT_AWS_IOT_LIGHT`` for password based AWS IoT authentication
+- Add ``#define MQTT_LWT_OFFLINE`` and ``#define MQTT_LWT_ONLINE`` to user_config.h (#9395)
 - Add new shutter modes (#9244)
 - Add Zigbee auto-config when pairing
 - Add support for MLX90640 IR array temperature sensor by Christian Baars
-- Change ``WakeUp`` uses 256 steps instead of 100 (#9241)
 
 ### 8.5.0 20200907
 
diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h
index 40b04a99c..8c6215eab 100644
--- a/tasmota/tasmota_globals.h
+++ b/tasmota/tasmota_globals.h
@@ -144,6 +144,12 @@ String EthernetMacAddress(void);
 #ifndef MQTT_CLEAN_SESSION
 #define MQTT_CLEAN_SESSION          1          // 0 = No clean session, 1 = Clean session (default)
 #endif
+#ifndef MQTT_LWT_OFFLINE
+#define MQTT_LWT_OFFLINE            "Offline"  // MQTT LWT offline topic message
+#endif
+#ifndef MQTT_LWT_ONLINE
+#define MQTT_LWT_ONLINE             "Online"   // MQTT LWT online topic message
+#endif
 
 #ifndef MESSZ
 //#define MESSZ                       1040     // Max number of characters in JSON message string (Hass discovery and nice MQTT_MAX_PACKET_SIZE = 1200)