diff --git a/README.md b/README.md
index cc0b83367..09354028a 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ See [RELEASENOTES.md](https://github.com/arendst/Sonoff-Tasmota/blob/development
 In addition to the [release webpage](https://github.com/arendst/Sonoff-Tasmota/releases/latest) the binaries can also be OTA downloaded from http://thehackbox.org/tasmota/release/
 
 ### Development
-[![Dev Version](https://img.shields.io/badge/development%20version-6.4.0.x-blue.svg)](https://github.com/arendst/Sonoff-Tasmota)
+[![Dev Version](https://img.shields.io/badge/development%20version-6.4.1.x-blue.svg)](https://github.com/arendst/Sonoff-Tasmota)
 [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://thehackbox.org/tasmota/)
 [![Build Status](https://img.shields.io/travis/arendst/Sonoff-Tasmota.svg)](https://travis-ci.org/arendst/Sonoff-Tasmota)
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 973658a4c..1198a6165 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -168,6 +168,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 | USE_TUYA_DIMMER                | - | x | - | x | x | x |
 | USE_ARMTRONIX_DIMMERS          | - | x | - | x | x | x |
 | USE_PS_16_DZ                   | - | x | - | x | x | x |
+| USE_AZ7798                     | - | - | - | - | - | - |
 | USE_IR_REMOTE                  | - | - | - | x | x | x |
 | USE_IR_HVAC                    | - | - | - | - | - | x |
 | USE_IR_RECEIVE                 | - | - | - | x | x | x |
@@ -184,6 +185,20 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
 | USE_DISPLAY                    | - | - | - | - | - | - |
 
 ## Changelog
+Version 6.4.1 20181225
+ * Change RAM usage BMP/BME I2C sensors
+ * Change FallbackTopic from cmnd/\<mqttclient\>/ to cmnd/\<mqttclient\>_fb/ to discriminate from Topic (#1528)
+ * Change FallbackTopic detection (#4706)
+ * Change Hass discovery to short MQTT messages as used by Hass 0.81 and up (#4711)
+ * Change MQTT GUI password handling (#4723)
+ * Fix possible dtostrf buffer overflows by increasing buffers
+ * Fix wifi strongest signal detection (#4704)
+ * Fix Alexa "this value is outside the range of the device". Needs power cycle and Alexa deletion/discovery cycle. (#3159, #4712)
+ * Add Slovak language file (#4663)
+ * Add support for AZ-Instrument 7798 CO2 meter/datalogger (#4672)
+ * Add define WIFI_SOFT_AP_CHANNEL in my_user_config.h to set Soft Access Point Channel number between 1 and 13 as used by Wifi Manager web GUI (#4673)
+ * Add define USE_MQTT_TLS_CA_CERT for checking MQTT TLS against root ca using Let's Encrypt cert from sonoff_letsencrypt.h - not supported with core 2.3.0 (#4703)
+
 Version 6.4.0 20181217
  * Change GUI Configure Module by using AJAX for data fetch to cut page size (and memory use) by 40%.
      In case of web page errors clear your browser cache or do Page Reload (F5 or Ctrl+R)
diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 0e1fb1075..1c96f7d5e 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,19 +1,16 @@
-/* 6.4.0.3 20181222
- * Change Hass discovery to short MQTT messages as used by Hass 0.81 and up (#4711)
- * Change FallbackTopic detection (#4706)
- * Add define WIFI_SOFT_AP_CHANNEL in my_user_config.h to set Soft Access Point Channel number between 1 and 13 as used by Wifi Manager web GUI (#4673)
- * Fix Alexa "this value is outside the range of the device". Needs power cycle and Alexa deletion/discovery cycle. (#3159, #4712)
- * Add define USE_MQTT_TLS_CA_CERT for checking MQTT TLS against root ca using Let's Encrypt cert from sonoff_letsencrypt.h - not supported with core 2.3.0 (#4703)
- * Change FallbackTopic from cmnd/<mqttclient>/ to cmnd/<mqttclient>_fb/ to discriminate from Topic (#1528)
- * Change MQTT GUI password handling (#4723)
- *
- * 6.4.0.2 20181221
- * Fix possible dtostrf buffer overflows by increasing buffers
- *
- * 6.4.0.1 20181217
- * Add support for AZ-Instrument 7798 CO2 meter/datalogger (#4672)
+/* 6.4.1 20181225
  * Change RAM usage BMP/BME I2C sensors
+ * Change FallbackTopic from cmnd/<mqttclient>/ to cmnd/<mqttclient>_fb/ to discriminate from Topic (#1528)
+ * Change FallbackTopic detection (#4706)
+ * Change Hass discovery to short MQTT messages as used by Hass 0.81 and up (#4711)
+ * Change MQTT GUI password handling (#4723)
+ * Fix possible dtostrf buffer overflows by increasing buffers
  * Fix wifi strongest signal detection (#4704)
+ * Fix Alexa "this value is outside the range of the device". Needs power cycle and Alexa deletion/discovery cycle. (#3159, #4712)
+ * Add Slovak language file (#4663)
+ * Add support for AZ-Instrument 7798 CO2 meter/datalogger (#4672)
+ * Add define WIFI_SOFT_AP_CHANNEL in my_user_config.h to set Soft Access Point Channel number between 1 and 13 as used by Wifi Manager web GUI (#4673)
+ * Add define USE_MQTT_TLS_CA_CERT for checking MQTT TLS against root ca using Let's Encrypt cert from sonoff_letsencrypt.h - not supported with core 2.3.0 (#4703)
  *
  * 6.4.0 20181217
  * Change GUI Configure Module by using AJAX for data fetch to cut page size (and memory use) by 40%
diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h
index 32b9dbd83..6e635a341 100644
--- a/sonoff/sonoff_version.h
+++ b/sonoff/sonoff_version.h
@@ -20,7 +20,7 @@
 #ifndef _SONOFF_VERSION_H_
 #define _SONOFF_VERSION_H_
 
-#define VERSION            0x06040003
+#define VERSION            0x06040100
 
 #define D_PROGRAMNAME      "Sonoff-Tasmota"
 #define D_AUTHOR           "Theo Arends"