diff --git a/compile.bat b/radio/util/build-companion.bat
similarity index 75%
rename from compile.bat
rename to radio/util/build-companion.bat
index 94d22efe3..4fdbff3c2 100644
--- a/compile.bat
+++ b/radio/util/build-companion.bat
@@ -1,6 +1,6 @@
-SET CODE_DIR=%~dp0%
+SET SRCDIR=%~dp0%
 
-cd %CODE_DIR%
+cd %SRCDIR%
 git fetch
 git checkout next
 git reset --hard origin/next
@@ -12,30 +12,30 @@ cd build
 
 SET COMMON_OPTIONS=-DCMAKE_PREFIX_PATH=C:\Qt\5.6\msvc2015 -DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=%1
 
-cmake %COMMON_OPTIONS% -DPCB=9X %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=9X %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=GRUVIN9X %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=GRUVIN9X %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=MEGA2560 %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=MEGA2560 %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=SKY9X %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=SKY9X %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=9XRPRO %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=9XRPRO %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=TARANIS %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=TARANIS %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=TARANIS -DPCBREV=REVPLUS %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=TARANIS -DPCBREV=REVPLUS %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=TARANIS -DPCBREV=REV9E %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=TARANIS -DPCBREV=REV9E %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 
-cmake %COMMON_OPTIONS% -DPCB=HORUS %CODE_DIR%
+cmake %COMMON_OPTIONS% -DPCB=HORUS %SRCDIR%
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" radio\src\targets\simu\libsimulator.vcxproj /t:Rebuild /p:Configuration=Release
 "C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" companion\src\installer.vcxproj /t:Rebuild /p:Configuration=Release
diff --git a/radio/util/build-companion.sh b/radio/util/build-companion.sh
new file mode 100644
index 000000000..7e3ef68c0
--- /dev/null
+++ b/radio/util/build-companion.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Stops on first error, echo on
+set -e
+set -x
+
+cd $1
+SRCDIR = $(pwd)
+
+git fetch
+git checkout next
+git reset --hard origin/next
+
+cd -
+mkdir build || true
+cd build
+rm -rf *
+
+COMMON_OPTIONS = -DALLOW_NIGHTLY_BUILDS=YES -DVERSION_SUFFIX=$2
+
+cmake ${COMMON_OPTIONS} -DPCB=9X ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=GRUVIN9X ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=MEGA2560 ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=TARANIS ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=TARANIS -DPCBREV=REVPLUS ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=TARANIS -DPCBREV=REV9E ${SRCDIR}
+make libsimulator
+
+cmake ${COMMON_OPTIONS} -DPCB=HORUS ${SRCDIR}
+make libsimulator
+
+make installer
diff --git a/radio/util/build.py b/radio/util/build-firmware.py
old mode 100755
new mode 100644
similarity index 100%
rename from radio/util/build.py
rename to radio/util/build-firmware.py