diff --git a/platformio/builder/scripts/basearm.py b/platformio/builder/scripts/basearm.py
index 33114dca..cb685caf 100644
--- a/platformio/builder/scripts/basearm.py
+++ b/platformio/builder/scripts/basearm.py
@@ -52,7 +52,10 @@ env.Replace(
 
     LIBS=["c", "gcc", "m"],
 
-    SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES'
+    SIZEPRINTCMD='"$SIZETOOL" -B -d $SOURCES',
+
+    PROGNAME="firmware",
+    PROGSUFFIX=".elf"
 )
 
 env.Append(
diff --git a/platformio/builder/scripts/baseavr.py b/platformio/builder/scripts/baseavr.py
index 3ac52b00..7566bcc4 100644
--- a/platformio/builder/scripts/baseavr.py
+++ b/platformio/builder/scripts/baseavr.py
@@ -49,7 +49,10 @@ env.Replace(
 
     LIBS=["m"],
 
-    SIZEPRINTCMD='"$SIZETOOL" --mcu=$BOARD_MCU -C -d $SOURCES'
+    SIZEPRINTCMD='"$SIZETOOL" --mcu=$BOARD_MCU -C -d $SOURCES',
+
+    PROGNAME="firmware",
+    PROGSUFFIX=".elf"
 )
 
 env.Append(
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index 3875dd15..fa035f6d 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -80,7 +80,10 @@ env.Replace(
         "-ca", "0x40000" if "FRAMEWORK" not in env else "0x10000",
         "-cf", "${SOURCES[1]}"
     ],
-    UPLOADCMD='$UPLOADER $UPLOADERFLAGS'
+    UPLOADCMD='$UPLOADER $UPLOADERFLAGS',
+
+    PROGNAME="firmware",
+    PROGSUFFIX=".elf"
 )
 
 env.Append(
diff --git a/platformio/builder/scripts/timsp430.py b/platformio/builder/scripts/timsp430.py
index 90507539..c928b357 100644
--- a/platformio/builder/scripts/timsp430.py
+++ b/platformio/builder/scripts/timsp430.py
@@ -57,7 +57,10 @@ env.Replace(
         "$UPLOAD_PROTOCOL" if system() != "Windows" else "tilib",
         "--force-reset"
     ],
-    UPLOADCMD='$UPLOADER $UPLOADERFLAGS "prog $SOURCES"'
+    UPLOADCMD='$UPLOADER $UPLOADERFLAGS "prog $SOURCES"',
+
+    PROGNAME="firmware",
+    PROGSUFFIX=".elf"
 )
 
 env.Append(
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 07fd4e45..be537d7d 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -63,14 +63,13 @@ def BuildFirmware(env):
     )
 
     return env.Program(
-        join("$BUILD_DIR", "firmware"),
+        join("$BUILD_DIR", env.subst("$PROGNAME")),
         env.LookupSources(
             "$BUILDSRC_DIR", "$PROJECTSRC_DIR", duplicate=False,
             src_filter=getenv("PLATFORMIO_SRC_FILTER",
                               env.get("SRC_FILTER", None))),
         LIBS=env.get("LIBS", []) + deplibs,
-        LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"],
-        PROGSUFFIX=".elf"
+        LIBPATH=env.get("LIBPATH", []) + ["$BUILD_DIR"]
     )