diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md
index 4d7cd944c..29b1d3e43 100644
--- a/tasmota/CHANGELOG.md
+++ b/tasmota/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Add ESP32 Analog input support for GPIO32 to GPIO39
 - Add Zigbee options to ``ZbSend`` ``Config`` and ``ReadCondig``
 - Add command ``Restart 2`` to halt system. Needs hardware reset or power cycle to restart (#9046)
+- Add command ``SetOption102 0/1`` to switch between Teleinfo French Metering mode, legacy 1200 bps (0) or Linky standard 9600 bps (1)
 
 ### 8.4.0 20200730
 
diff --git a/tasmota/settings.h b/tasmota/settings.h
index 213863ef1..7241efc33 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -121,7 +121,7 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t zerocross_dimmer : 1;         // bit 17 (v8.3.1.4)  - SetOption99 - Enable zerocross dimmer on PWM DIMMER
     uint32_t remove_zbreceived : 1;        // bit 18 (v8.3.1.7)  - SetOption100 - Remove ZbReceived form JSON message
     uint32_t zb_index_ep : 1;              // bit 19 (v8.3.1.7)  - SetOption101 - Add the source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3
-    uint32_t spare20 : 1;
+    uint32_t teleinfo_baudrate : 1;        // bit 20 (v8.4.0.1)  - SetOption102 - Set Baud rate for Teleinfo communication (0 = 1200 or 1 = 9600)
     uint32_t spare21 : 1;
     uint32_t spare22 : 1;
     uint32_t spare23 : 1;
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index e389bb64b..bd8019be9 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -904,6 +904,7 @@ void CmndSetoption(void)
               case 3:                      // SetOption85 - Enable Device Groups
               case 6:                      // SetOption88 - PWM Dimmer Buttons control remote devices
               case 15:                     // SetOption97 - Set Baud rate for TuyaMCU serial communication (0 = 9600 or 1 = 115200)
+              case 20:                     // SetOption102 - Set Baud rate for Teleinfo serial communication (0 = 1200 or 1 = 9600)
                 restart_flag = 2;
                 break;
             }