diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7cacefa47..8cf1a0022 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -104,6 +104,12 @@ See [Tasmota ESP/Arduino library version related issues](https://github.com/aren
 | USE_RF_FLASH                   | - | - | x | x | x |
 
 ## Changelog
+Version 6.2.1 20180905
+ * Fix possible ambiguity on command parameters if StateText contains numbers only (#3656)
+ * Fix Wemo emulation to select the first relay when more than one relay is present (#3657)
+ * Fix possible exception due to buffer overflow (#3659)
+ * Fix lost energy today and total energy value after power cycle (#3689)
+
 Version 6.2.0 20180901
  * Allow user override of define MAX_RULE_VARS and MAX_RULE_TIMERS (#3561)
  * Disable wifi sleep for both Esp8266/Arduino core 2.4.1 and 2.4.2 to solve device freeze caused by Espressif SDK bug (#3554)
diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino
index 0b3c115cd..145e435e3 100644
--- a/sonoff/_changelog.ino
+++ b/sonoff/_changelog.ino
@@ -1,14 +1,14 @@
-/* 6.2.0.2 20180904
+/* 6.2.1.1 20180905
  * Rewrite energy monitoring using energy sensor driver modules
- * Fix lost today and total energy value after power cycle (#3689)
- *
- * 6.2.0.1 20180902
- * Fix possible ambiguity on command parameters if StateText contains numbers only (#3656)
- * Fix possible exception due to buffer overflow (#3659)
  * Add Wifi channel number to state message (#3664)
- * Fix Wemo emulation to select the first relay when more than one relay is present (#3657)
  * Add support for Shelly 1 and basic support for Shelly 2 - No energy monitoring yet (#2789)
  *
+ * 6.2.1 20180905
+ * Fix possible ambiguity on command parameters if StateText contains numbers only (#3656)
+ * Fix Wemo emulation to select the first relay when more than one relay is present (#3657)
+ * Fix possible exception due to buffer overflow (#3659)
+ * Fix lost energy today and total energy value after power cycle (#3689)
+ *
  * 6.2.0 20180901
  * Allow user override of define MAX_RULE_VARS and MAX_RULE_TIMERS (#3561)
  * Disable wifi sleep for both Esp8266/Arduino core 2.4.1 and 2.4.2 to solve device freeze caused by Espressif SDK bug (#3554)
diff --git a/sonoff/sonoff_version.h b/sonoff/sonoff_version.h
index e9e92cc9d..f4df759c8 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            0x06020002
+#define VERSION            0x06020101
 
 #define D_PROGRAMNAME      "Sonoff-Tasmota"
 #define D_AUTHOR           "Theo Arends"
diff --git a/sonoff/xplg_wemohue.ino b/sonoff/xplg_wemohue.ino
index bc579782a..93912bc76 100644
--- a/sonoff/xplg_wemohue.ino
+++ b/sonoff/xplg_wemohue.ino
@@ -397,7 +397,6 @@ void HandleUpnpEvent()
       uint8_t device = (light_type) ? devices_present : 1;  // Select either a configured light or relay1
       ExecuteCommandPower(device, power, SRC_WEMO);
     }
-
   }
   else if(request.indexOf(F("GetBinaryState")) > 0){
     state_xml.replace(F("Set"), F("Get"));