diff --git a/.travis.sh b/.travis.sh
index 0d6a3cdc1a..1e90137c37 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
+FC_VER=$(make version)
 REVISION=$(git rev-parse --short HEAD)
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
 REVISION=$(git rev-parse --short HEAD)
 LAST_COMMIT_DATE=$(git log -1 --date=short --format="%cd")
-TARGET_FILE=obj/betaflight_${TARGET}
+TARGET_FILE=obj/betaflight_${FC_VER}_${TARGET}
 TRAVIS_REPO_SLUG=${TRAVIS_REPO_SLUG:=$USER/undefined}
 BUILDNAME=${BUILDNAME:=travis}
 TRAVIS_BUILD_NUMBER=${TRAVIS_BUILD_NUMBER:=undefined}
@@ -46,7 +47,8 @@ elif [ $PUBLISHMETA ] ; then
 	fi
 
 elif [ $TARGET ] ; then
-    make $TARGET
+    make $TARGET || exit $?
+
 	if [ $PUBLISH_URL ] ; then
 		if   [ -f ${TARGET_FILE}.bin ] ; then
 			TARGET_FILE=${TARGET_FILE}.bin
@@ -60,8 +62,10 @@ elif [ $TARGET ] ; then
 		curl -k "${CURL_BASEOPTS[@]}" "${CURL_PUB_BASEOPTS[@]}" --form "file=@${TARGET_FILE}" ${PUBLISH_URL} || true
 		exit 0;
 	fi
+
 elif [ $GOAL ] ; then
     make V=0 $GOAL
+
 else 
     make V=0 all
 fi
diff --git a/Makefile b/Makefile
index d1bc978c4a..cf01b5b54f 100644
--- a/Makefile
+++ b/Makefile
@@ -1285,6 +1285,10 @@ $(TOOLS_DIR):
 $(BUILD_DIR):
 	mkdir -p $@
 
+## version           : print firmware version
+version:
+	@echo $(FC_VER)
+
 ## help              : print this help message and exit
 help: Makefile make/tools.mk
 	$(V0) @echo ""