diff --git a/radio/src/Makefile b/radio/src/Makefile
index bad13cb73..ec06cddbc 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -886,7 +886,7 @@ ifeq ($(PCB), TARANIS)
   CPPSRC += bmp.cpp gui/$(GUIDIRECTORY)/view_channels.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp loadboot.cpp debug.cpp
   ifeq ($(PCBREV), REV9E)
     EXTRABOARDSRC += targets/taranis/top_lcd_driver.cpp
-	SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
+	SRC += targets/taranis/system_stm32f4xx.c
 	SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/misc.c
 	SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c
 	SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_dbgmcu.c
@@ -898,7 +898,7 @@ ifeq ($(PCB), TARANIS)
 	SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c
 	SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc_ride7/startup_stm32f40_41xxx.s
   else
-	SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
+	SRC += targets/taranis/system_stm32f2xx.c
 	SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/misc.c
 	SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
 	SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_dbgmcu.c
diff --git a/radio/src/targets/taranis/bootloader/Makefile b/radio/src/targets/taranis/bootloader/Makefile
index 41e522748..7b33a0e2b 100755
--- a/radio/src/targets/taranis/bootloader/Makefile
+++ b/radio/src/targets/taranis/bootloader/Makefile
@@ -131,13 +131,13 @@ UADEFS =
 SRC =
 
 ifeq ($(PCBREV), REV9E)
-  SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
+  SRC += ../system_stm32f4xx.c
   SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_rcc.c
   SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_gpio.c
   SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_spi.c
   SRC += $(STM32LIBPATH)/STM32F4xx_StdPeriph_Driver/src/misc.c
 else
-  SRC += $(STM32LIBPATH)/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
+  SRC += ../system_stm32f2xx.c
   SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c
   SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
   SRC += $(STM32LIBPATH)/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_spi.c
diff --git a/radio/src/thirdparty/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c b/radio/src/targets/taranis/system_stm32f2xx.c
similarity index 100%
rename from radio/src/thirdparty/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
rename to radio/src/targets/taranis/system_stm32f2xx.c
diff --git a/radio/src/thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c b/radio/src/targets/taranis/system_stm32f4xx.c
similarity index 97%
rename from radio/src/thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
rename to radio/src/targets/taranis/system_stm32f4xx.c
index 2de3abef6..c3d8c7610 100644
--- a/radio/src/thirdparty/STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/CMSIS/Device/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c
+++ b/radio/src/targets/taranis/system_stm32f4xx.c
@@ -120,7 +120,7 @@
   * @{
   */
 
-#include "../../Include/stm32f4xx.h"
+#include "stm32f4xx.h"
 
 /**
   * @}