diff --git a/bin/build-all.sh b/bin/build-all.sh
index 45473c630..0cdecaa91 100755
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -9,6 +9,7 @@ COUNTRIES="US EU433 EU865 CN JP"
 
 SRCMAP=.pio/build/esp32/output.map
 SRCBIN=.pio/build/esp32/firmware.bin
+SRCELF=.pio/build/esp32/firmware.elf
 OUTDIR=release/latest
 
 # We keep all old builds (and their map files in the archive dir)
@@ -26,12 +27,14 @@ for COUNTRY in $COUNTRIES; do
     rm -f $SRCBIN $SRCMAP
     pio run # -v
     cp $SRCBIN $OUTDIR/firmware-TBEAM-$COUNTRY-$VERSION.bin
+    cp $SRCELF $OUTDIR/firmware-TBEAM-$COUNTRY-$VERSION.elf    
     #cp $SRCMAP $ARCHIVEDIR/firmware-TBEAM-$COUNTRY-$VERSION.map
 
     export PLATFORMIO_BUILD_FLAGS="-DHELTEC_LORA32 $COMMONOPTS"
     rm -f $SRCBIN $SRCMAP
     pio run # -v
     cp $SRCBIN $OUTDIR/firmware-HELTEC-$COUNTRY-$VERSION.bin
+    cp $SRCELF $OUTDIR/firmware-HELTEC-$COUNTRY-$VERSION.elf
     #cp $SRCMAP $ARCHIVEDIR/firmware-HELTEC-$COUNTRY-$VERSION.map
 done
 
@@ -51,6 +54,6 @@ Generated by bin/buildall.sh -->
 XML
 
 rm -f $ARCHIVEDIR/firmware-$VERSION.zip
-zip $ARCHIVEDIR/firmware-$VERSION.zip $OUTDIR/firmware-*-$VERSION.bin
+zip $ARCHIVEDIR/firmware-$VERSION.zip $OUTDIR/firmware-*-$VERSION.*
 
 echo BUILT ALL
\ No newline at end of file