diff --git a/move-rename-firmware.py b/move-rename-firmware.py
new file mode 100644
index 00000000..bf04a4b4
--- /dev/null
+++ b/move-rename-firmware.py
@@ -0,0 +1,48 @@
+#This script is based on the Tasmota rename-firmware.py script. https://github.com/arendst/Tasmota
+
+Import('env')
+import os
+import shutil
+
+buildFlags = env.ParseFlags(env['BUILD_FLAGS'])
+
+def get_fw_version(source, target, env):
+    global HASP_VERSION_MAJOR
+    global HASP_VERSION_MINOR
+    global HASP_VERSION_REVISION
+
+    for item in buildFlags.get("CPPDEFINES"): 
+        if (type(item) is list):
+            if (item[0]=="HASP_VERSION_MAJOR"): HASP_VERSION_MAJOR = item[1]
+            if (item[0]=="HASP_VERSION_MINOR"): HASP_VERSION_MINOR = item[1]
+            if (item[0]=="HASP_VERSION_REVISION"): HASP_VERSION_REVISION = item[1]
+            print("   * %s = %s" % (item[0],item[1]))
+        else:
+            print("   * %s" % item)
+
+OUTPUT_DIR = "build_output{}".format(os.path.sep)
+
+def bin_copy_rename(source, target, env):
+    variant = str(target[0]).split(os.path.sep)[2] + '_v' + str(HASP_VERSION_MAJOR) + '.' + str(HASP_VERSION_MINOR) + '.' + str(HASP_VERSION_REVISION)
+    
+    # check if output directories exist and create if necessary
+    if not os.path.isdir(OUTPUT_DIR):
+        os.mkdir(OUTPUT_DIR)
+
+    for d in ['firmware', 'map']:
+        if not os.path.isdir("{}{}".format(OUTPUT_DIR, d)):
+            os.mkdir("{}{}".format(OUTPUT_DIR, d))
+
+    # create string with location and file names based on variant
+    bin_file = "{}firmware{}{}.bin".format(OUTPUT_DIR, os.path.sep, variant)
+
+    # check if new target files exist and remove if necessary
+    for f in [bin_file]:
+        if os.path.isfile(f):
+            os.remove(f)
+
+    # copy firmware.bin to firmware/<variant>.bin
+    shutil.copy(str(target[0]), bin_file)
+
+env.AddPreAction("$BUILD_DIR/${PROGNAME}.bin", [get_fw_version])
+env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [bin_copy_rename])
diff --git a/platformio.ini b/platformio.ini
index ed112287..72715d55 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -82,7 +82,7 @@ build_flags =
 
 src_filter = +<*> -<.git/> -<.svn/> -<example/> -<examples/> -<test/> -<tests/> -<stm32f4/>
 
-extra_scripts = pre:extra_script.py
+extra_scripts = move-rename-firmware.py ; pre:extra_script.py
 
 ; -- Platform specific build flags
 [flags]