diff --git a/Makefile b/Makefile
index 1a4b7dc045..aa7ca4712a 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,12 @@ MESSAGES_XML = $(CONF)/messages.xml
 UBX_XML = $(CONF)/ubx.xml
 XSENS_XML = $(CONF)/xsens_MTi-G.xml
 TOOLS=$(PAPARAZZI_SRC)/sw/tools
+HAVE_ARM_NONE_EABI_GCC := $(wildcard /usr/bin/arm-none-eabi-gcc)
+ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),)
 ARMGCC=/usr/bin/arm-elf-gcc
+else
+ARMGCC=/usr/bin/arm-none-eabi-gcc
+endif
 
 
 all: static conf