diff --git a/conf/Makefile.chibios b/conf/Makefile.chibios
index fa48b567b5..0e65efef3c 100644
--- a/conf/Makefile.chibios
+++ b/conf/Makefile.chibios
@@ -353,10 +353,6 @@ else
 OOCD_BOARD =  $($(TARGET).OOCD_BOARD)
 endif
 
-###############################################################################
-# Upload makefile
-include $(PAPARAZZI_HOME)/conf/Makefile.stm32-upload
-
 ###############################################################################
 
 RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
@@ -364,3 +360,7 @@ RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
 
 EXTRA_RULES_INCLUDE_PATH = $(PAPARAZZI_HOME)/conf/chibios/chibios_extra_rules.mk
 include $(PAPARAZZI_HOME)/conf/chibios/chibios_rules.mk
+
+###############################################################################
+# Upload makefile
+include $(PAPARAZZI_HOME)/conf/Makefile.stm32-upload