diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 947d0ca12..9c5a16480 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -163,15 +163,18 @@ elseif(PCB STREQUAL SKY9X OR PCB STREQUAL 9XRPRO OR PCB STREQUAL AR9X)
     add_definitions(-Dat91sam3s8 -DREVX)
     set(FLAVOUR 9xrpro)
     set(LINKER_SCRIPT targets/sky9x/sam3s8c_flash.ld)
+    set(BOOTLOADER bootflash8.lbm)
   elseif(PCB STREQUAL AR9X)
     add_definitions(-Dat91sam3s8 -DAR9X)
     set(FLAVOUR ar9x)
     set(LINKER_SCRIPT targets/sky9x/sam3s8c_flash.ld)
+    set(BOOTLOADER bootflash8.lbm)
   else()
     set(FLAVOUR sky9x)
     option(PCBREV "PCB Revision" REVC)
     set(TARGET_SRC ${TARGET_SRC} coproc_driver.cpp rotenc_driver.cpp)
     add_definitions(-DROTARY_ENCODERS=1)
+    set(BOOTLOADER bootflash4.lbm)
     if(PCBREV STREQUAL REVA)
       add_definitions(-DDREVA)
       set(LINKER_SCRIPT targets/sky9x/sam3s2c_flash.ld)
@@ -783,7 +786,8 @@ if(ARCH STREQUAL ARM)
     add_custom_target(bootloader DEPENDS bootloader.lbm)
     set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} bootloader)
   else()
-    file(DOWNLOAD http://ersky9x.googlecode.com/svn/trunk/src/bootloader/bootflash8.lbm ${CMAKE_CURRENT_BINARY_DIR}/bootloader.lbm)
+    # We fetch Mike's bootloader as it is not included inside OpenTX
+    file(DOWNLOAD https://github.com/MikeBland/OpenRcBootloader/releases/download/V1.9/${BOOTLOADER} ${CMAKE_CURRENT_BINARY_DIR}/bootloader.lbm)
   endif()
 
   add_executable(firmware.elf ${SRC} ${FIRMWARE_HEADERS})
diff --git a/radio/src/Makefile b/radio/src/Makefile
index 939fc69d8..3ba1275f1 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1794,12 +1794,12 @@ bootloader.lbm: targets/taranis/bootloader/bootloader_ramBoot.bin
 else ifeq ($(PCB), $(filter $(PCB), 9XRPRO AR9X))
 bootloader.lbm:
 	@echo "Fetching Mike's bootloader..."
-	wget http://ersky9x.googlecode.com/svn/trunk/src/bootloader/bootflash8.lbm
+	wget https://github.com/MikeBland/OpenRcBootloader/releases/download/V1.9/bootflash8.lbm
 	mv bootflash8.lbm $@
 else ifeq ($(PCB), SKY9X)
 bootloader.lbm:
 	@echo "Fetching Mike's bootloader..."
-	wget http://ersky9x.googlecode.com/svn/trunk/src/bootloader/bootflash4.lbm
+	wget https://github.com/MikeBland/OpenRcBootloader/releases/download/V1.9/bootflash4.lbm
 	mv bootflash4.lbm $@
 endif