diff --git a/.gitignore b/.gitignore
index 335be47ea..3c2f91f89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
+*.o
 *.a
 *.d
-*.o
 *.bin
 *.elf
 *.hex
 *.list
 *.srec
-usb.pb*
+*.log
 bootloader
diff --git a/Makefile.include b/Makefile.include
index f51cfc231..9310d57be 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -118,9 +118,10 @@ $(NAME).elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/libopencm3_stm32f2.a $(TOP
 clean:
 	rm -f $(OBJS)
 	rm -f *.a
+	rm -f *.bin
 	rm -f *.d
 	rm -f *.elf
-	rm -f *.bin
 	rm -f *.hex
-	rm -f *.srec
 	rm -f *.list
+	rm -r *.log
+	rm -f *.srec
diff --git a/docker-build.sh b/firmware-docker-build.sh
similarity index 62%
rename from docker-build.sh
rename to firmware-docker-build.sh
index 4cb95deee..ab44c9c52 100755
--- a/docker-build.sh
+++ b/firmware-docker-build.sh
@@ -3,10 +3,10 @@
 dirname $0
 
 # Build trezor firmware
-docker build . | tee docker.log
+docker build . | tee firmware-docker-build.log
 
 # Parse image name
-IMAGE=`grep "Successfully built" docker.log | tail -n1 | cut -d' ' -f3`
+IMAGE=`grep "Successfully built" firmware-docker-build.log | tail -n1 | cut -d' ' -f3`
 echo "IMAGE NAME: $IMAGE"
 
 docker run -t $IMAGE true
@@ -17,8 +17,7 @@ echo "CONTAINER NAME: $CONTAINER"
 
 docker cp $CONTAINER:/trezor-mcu/firmware/trezor.bin .
 
-echo "-------------------------"
-echo ""
-echo "SHA256 hash:"
+echo "---------------------"
+echo "Firmware fingerprint:"
 
 sha256sum trezor.bin
diff --git a/firmware-fingerprint.sh b/firmware-fingerprint.sh
index 498ba9c9b..d235528f4 100755
--- a/firmware-fingerprint.sh
+++ b/firmware-fingerprint.sh
@@ -7,5 +7,6 @@ if [ "x$MAGIC" != "xTRZR" ]; then
     exit 1
 fi
 
+echo "---------------------"
 echo "Firmware fingerprint:"
 tail -c +257 $1 | sha256sum