diff --git a/Makefile b/Makefile
index e72876bf10..b04ace6307 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ MULTIMON=sw/ground_segment/multimon
 MISC=sw/ground_segment/misc
 LOGALIZER=sw/logalizer
 SIMULATOR=sw/simulator
-MAKE:=$(MAKE) PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
+MAKE=make PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
 CONF=$(PAPARAZZI_SRC)/conf
 STATICINCLUDE =$(PAPARAZZI_HOME)/var/include
 MESSAGES_H=$(STATICINCLUDE)/messages.h
@@ -248,7 +248,7 @@ cleanspaces:
 
 distclean : dist_clean
 dist_clean :
-	@echo "Warning: This removes all non-repository files. This means you will loose your aircraft list, your maps, your logfiles, ... if you want this, then run: $(MAKE) dist_clean_irreversible"
+	@echo "Warning: This removes all non-repository files. This means you will loose your aircraft list, your maps, your logfiles, ... if you want this, then run: make dist_clean_irreversible"
 
 dist_clean_irreversible: clean
 	rm -rf conf/srtm_data
@@ -266,7 +266,7 @@ test_all_example_airframes:
 	$(MAKE) AIRCRAFT=EasyStar_ETS clean_ac ap sim
 
 test_all_example_airframes2:
-	for ap in `grep name conf/conf.xml.example | sed -e 's/.*name=\"//' | sed -e 's/"//'`; do echo "Making $$ap"; $(MAKE) -C ./ AIRCRAFT=$$ap clean_ac ap.compile || exit 1;   done
+	for ap in `grep name conf/conf.xml.example | sed -e 's/.*name=\"//' | sed -e 's/"//'`; do echo "Making $$ap"; make -C ./ AIRCRAFT=$$ap clean_ac ap.compile || exit 1;   done
 
 commands: paparazzi sw/simulator/launchsitl
 
diff --git a/Makefile.ac b/Makefile.ac
index d738526d7f..3d04b1aa22 100644
--- a/Makefile.ac
+++ b/Makefile.ac
@@ -51,7 +51,7 @@ SETTINGS_FILE=$(SETTINGS:settings%=%)
 #TUNING_FILE=$(subst   ,_,$(SETTINGS:settings/%.xml=%)).h
 TUNING_H=$(AC_GENERATED)/tuning.h
 SUPERVISION=./paparazzi
-MAKE:=$(MAKE) PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
+MAKE=make PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
 MODULES_H=$(AC_GENERATED)/modules.h
 AIRCRAFT_MD5=$(AIRCRAFT_CONF_DIR)/aircraft.md5
 
@@ -138,7 +138,7 @@ $(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_modules.out $(CONF)/modules/
 $(SETTINGS_MODULES) : $(MODULES_H)
 
 %.ac_h : $(TOOLS)/gen_aircraft.out
-	$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type '$(MAKE) AIRCRAFT=AircraftName ...'"; exit 1; fi
+	$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi
 	@echo BUILD $(AIRCRAFT), TARGET $*
 	+$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) TARGET=$* Q=$(Q) $(TOOLS)/gen_aircraft.out $(AIRCRAFT)
 
@@ -187,5 +187,5 @@ check_fuses_fbw: fbw.check_fuses
 hard_ac ac: ac_h fbw ap
 
 clean_ac :
-	$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type '$(MAKE) AIRCRAFT=AircraftName ...'"; exit 1; fi
+	$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi
 	rm -fr $(PAPARAZZI_HOME)/var/$(AIRCRAFT)
diff --git a/sw/ground_segment/multimon/Makefile b/sw/ground_segment/multimon/Makefile
index 45e235386e..d7c9d2988b 100644
--- a/sw/ground_segment/multimon/Makefile
+++ b/sw/ground_segment/multimon/Makefile
@@ -32,7 +32,7 @@ LD		=ld
 LDFLAGS		=-lm
 HOSTCC		=gcc
 CC		=gcc
-MAKE		:=$(MAKE)
+MAKE		=make
 CPP		=$(CC) -E
 AR		=ar
 STRIP		=strip