diff --git a/pio/rename-firmware.py b/pio/rename-firmware.py
new file mode 100644
index 000000000..c7644e3f8
--- /dev/null
+++ b/pio/rename-firmware.py
@@ -0,0 +1,9 @@
+Import('env')
+import os
+
+def obj_ren_after_bin(source, target, env):
+    #    print("Rename firmware.bin")
+    base_dir = os.path.dirname(str(target[0]))
+    os.rename(str(target[0]), "{}{}{}.bin".format(base_dir, os.path.sep, str(target[0]).split(os.path.sep)[1]))
+
+env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [obj_ren_after_bin]) 
diff --git a/platformio.ini b/platformio.ini
index 294713cf5..eb925b680 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -86,6 +86,7 @@ upload_resetmethod        = nodemcu
 ; *** Upload Serial reset method for Wemos and NodeMCU
 upload_port               = COM5
 extra_scripts             = pio/strip-floats.py
+                            pio/rename-firmware.py
                             pio/obj-dump.py
 
 ; *** Upload file to OTA server using SCP