diff --git a/build-bootloader.sh b/build-bootloader.sh
index b64c8ac1c..d7c7afd78 100755
--- a/build-bootloader.sh
+++ b/build-bootloader.sh
@@ -4,6 +4,7 @@ set -e
 IMAGE=trezor-mcu-build
 TAG=${1:-master}
 BINFILE=build/bootloader-$TAG.bin
+ELFFILE=build/bootloader-$TAG.elf
 
 docker build -t $IMAGE .
 docker run -t -v $(pwd)/build:/build:z $IMAGE /bin/sh -c "\
@@ -15,8 +16,8 @@ docker run -t -v $(pwd)/build:/build:z $IMAGE /bin/sh -c "\
 	make && \
 	make -C bootloader && \
 	make -C bootloader align && \
-	cp bootloader/bootloader.bin /$BINFILE"
-
+	cp bootloader/bootloader.bin /$BINFILE && \
+	cp bootloader/bootloader.elf /$ELFFILE"
 /usr/bin/env python -c "
 from __future__ import print_function
 import hashlib
diff --git a/build-firmware.sh b/build-firmware.sh
index a9a9a32cd..3eb6365b6 100755
--- a/build-firmware.sh
+++ b/build-firmware.sh
@@ -4,6 +4,7 @@ set -e
 IMAGE=trezor-mcu-build
 TAG=${1:-master}
 BINFILE=build/trezor-$TAG.bin
+ELFFILE=build/trezor-$TAG.elf
 
 docker build -t $IMAGE .
 docker run -t -v $(pwd)/build:/build:z $IMAGE /bin/sh -c "\
@@ -15,7 +16,8 @@ docker run -t -v $(pwd)/build:/build:z $IMAGE /bin/sh -c "\
 	make && \
 	make -C firmware && \
 	make -C firmware sign && \
-	cp firmware/trezor.bin /$BINFILE"
+	cp firmware/trezor.bin /$BINFILE && \
+	cp firmware/trezor.elf /$ELFFILE"
 
 /usr/bin/env python -c "
 from __future__ import print_function