diff --git a/CHANGELOG.md b/CHANGELOG.md
index a55fc03ee..c7b903e97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Force initial default state ``SetOption57 1`` to scan wifi network every 44 minutes for strongest signal (#10395)
 - Command ``Sleep 0`` removes any sleep from wifi modem except when ESP32 BLE is active
+- PubSubClient MQTT_SOCKET_TIMEOUT from 15 to 4 seconds
 
 ## [9.2.0.2] 20210105
 ### Added
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ee4096131..c45f5a240 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -85,6 +85,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Support rotary encoder on Shelly Dimmer [#10407](https://github.com/arendst/Tasmota/issues/10407#issuecomment-756240920)
 - Support character `#` to be replaced by `space`-character in command ``Publish`` topic [#10258](https://github.com/arendst/Tasmota/issues/10258)
 - Basic support for ESP32 Odroid Go 16MB binary tasmota32-odroidgo.bin [#8630](https://github.com/arendst/Tasmota/issues/8630)
+- Basic support for ESP32 M5stack core2 16MB binary tasmota32-core2.bin [#10635](https://github.com/arendst/Tasmota/issues/10635)
 - SPI display driver SSD1331 Color oled by Jeroen Vermeulen [#10376](https://github.com/arendst/Tasmota/issues/10376)
 - Compile time option ``USE_MQTT_TLS_DROP_OLD_FINGERPRINT`` to drop old (less secure) TLS fingerprint
 
@@ -105,6 +106,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Logging from heap to stack freeing 700 bytes RAM
 - Disabled ``USE_LIGHT`` light support for ZBBridge saving 17.6kB [#10374](https://github.com/arendst/Tasmota/issues/10374)
 - Force initial default state ``SetOption57 1`` to scan wifi network every 44 minutes for strongest signal [#10395](https://github.com/arendst/Tasmota/issues/10395)
+- PubSubClient MQTT_SOCKET_TIMEOUT from 15 to 4 seconds
 
 ### Fixed
 - Redesign syslog and mqttlog using log buffer [#10164](https://github.com/arendst/Tasmota/issues/10164)
diff --git a/lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h b/lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
index 612029665..19b35160a 100644
--- a/lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
+++ b/lib/default/PubSubClient-EspEasy-2.7.12/src/PubSubClient.h
@@ -25,19 +25,20 @@
 #ifndef MQTT_MAX_PACKET_SIZE
 //#define MQTT_MAX_PACKET_SIZE 128
 //#define MQTT_MAX_PACKET_SIZE 1000   // Tasmota v5.11.1c
-#define MQTT_MAX_PACKET_SIZE 1200   // Tasmota v8.1.0.8
+#define MQTT_MAX_PACKET_SIZE 1200     // Tasmota v8.1.0.8
 #endif
 
 // MQTT_KEEPALIVE : keepAlive interval in Seconds
 // Keepalive timeout for default MQTT Broker is 10s
 #ifndef MQTT_KEEPALIVE
 //#define MQTT_KEEPALIVE 10
-#define MQTT_KEEPALIVE 30  // Tasmota v6.5.0.14 enabling AWS-iot
+#define MQTT_KEEPALIVE 30             // Tasmota v6.5.0.14 enabling AWS-iot
 #endif
 
 // MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds
 #ifndef MQTT_SOCKET_TIMEOUT
-#define MQTT_SOCKET_TIMEOUT 15
+//#define MQTT_SOCKET_TIMEOUT 15
+#define MQTT_SOCKET_TIMEOUT 4         // Tasmota 20210120
 #endif
 
 // MQTT_MAX_TRANSFER_SIZE : limit how much data is passed to the network client