diff --git a/tools/build-companion.sh b/tools/build-companion-nightly.sh
similarity index 100%
rename from tools/build-companion.sh
rename to tools/build-companion-nightly.sh
diff --git a/tools/build-companion-release.sh b/tools/build-companion-release.sh
new file mode 100755
index 000000000..83fcb2eb2
--- /dev/null
+++ b/tools/build-companion-release.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Stops on first error, echo on
+set -e
+set -x
+
+JOBS=2
+
+while [ $# -gt 0 ]
+do
+  case "$1" in
+    --jobs=*)
+      JOBS="${1#*=}";;
+    -j*)
+      JOBS="${1#*j}";;
+    -*)
+      echo >&2 "usage: $0 [-j<jobs>|--jobs=<jobs>] SRCDIR OUTDIR VERSION_SUFFIX"
+      exit 1;;
+    *)
+      break;;   # terminate while loop
+  esac
+  shift
+done
+
+SRCDIR=$1
+OUTDIR=$2
+
+COMMON_OPTIONS="-DGVARS=YES -DHELI=YES -DLUA=YES -DMULTIMODULE=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DGAUGES=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES"
+if [ "$(uname)" = "Darwin" ]; then
+    COMMON_OPTIONS="${COMMON_OPTIONS} -DCMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/ -DCMAKE_OSX_DEPLOYMENT_TARGET='10.9'"
+fi
+
+if [ "$3" != "" ]; then
+  COMMON_OPTIONS="${COMMON_OPTIONS} -DVERSION_SUFFIX=$3"
+fi
+
+rm -rf build
+mkdir build
+cd build
+
+cmake ${COMMON_OPTIONS} -DPCB=9X ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=GRUVIN9X ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=X9E ${SRCDIR}
+make -j${JOBS} libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR}
+make -j${JOBS} libsimulator
+
+make -j${JOBS} package
+
+if [ "$(uname)" = "Darwin" ]; then
+    cp *.dmg ${OUTDIR}
+else
+    cp *.deb ${OUTDIR}
+fi
diff --git a/tools/nightly22/build-nightly.sh b/tools/nightly22/build-nightly.sh
index 70fe3e780..9c9e6ea3c 100755
--- a/tools/nightly22/build-nightly.sh
+++ b/tools/nightly22/build-nightly.sh
@@ -30,7 +30,7 @@ docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
 docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
 docker exec companion rm -rf build
 if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
-  docker exec companion /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/ ${suffix}
+  docker exec companion /opentx/code/tools/build-companion-nightly.sh /opentx/code /opentx/binaries/ ${suffix}
   cp -f  binaries/*.deb ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb
 fi
 docker stop companion
diff --git a/tools/release22/build-release.sh b/tools/release22/build-release.sh
index ff87c9014..248c9e290 100755
--- a/tools/release22/build-release.sh
+++ b/tools/release22/build-release.sh
@@ -25,7 +25,7 @@ docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
 docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
 docker exec companion rm -rf build
 if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
-  docker exec companion /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/
+  docker exec companion /opentx/code/tools/build-companion-release.sh /opentx/code /opentx/binaries/
   cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}_amd64.deb
   cp -f binaries/radio/src/lua/lua_fields_*.txt ${output}/firmware
 fi