diff --git a/Makefile.include b/Makefile.include
index 983297c637f675a69096c1f68364ceb5f16e2b61..292ba296675070a4c37baa5d32649b92b24357a9 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -45,9 +45,9 @@ endif
 ## make script for your project. Build RIOT-base here!
 all: $(PROJBINDIR)/$(PROJECT).a
 	@echo "Building project $(PROJECT) for $(BOARD) w/ MCU $(MCU)."
-	$(MAKE) -C $(RIOTBOARD)
-	$(MAKE) -C $(RIOTBASE)
-	@for i in $(EXTERNAL_MODULES) ; do $(MAKE) -C $$i ; done ;
+	"$(MAKE)" -C $(RIOTBOARD)
+	"$(MAKE)" -C $(RIOTBASE)
+	@for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i ; done ;
 ifeq ($(BUILDOSXNATIVE),1)	
 	@$(LINK) $(UNDEF) -o $(PROJBINDIR)/$(PROJECT).elf $(BASELIBS) $(LINKFLAGS) -Wl,-no_pie
 else
@@ -79,9 +79,9 @@ $(PROJBINDIR)/%.o: %.c $(PROJDEPS)
 	$(CC) $(CFLAGS) $(INCLUDES) -c $*.c -o $(PROJBINDIR)/$*.o
 
 clean:
-	$(MAKE) -C $(RIOTBOARD) clean
-	$(MAKE) -C $(RIOTBASE) clean
-	@for i in $(EXTERNAL_MODULES) ; do $(MAKE) -C $$i clean ; done ;
+	"$(MAKE)" -C $(RIOTBOARD) clean
+	"$(MAKE)" -C $(RIOTBASE) clean
+	@for i in $(EXTERNAL_MODULES) ; do "$(MAKE)" -C $$i clean ; done ;
 	rm -rf $(PROJBINDIR)
 
 flash: all
diff --git a/cpu/Makefile b/cpu/Makefile
index 88427b8e839460884aca2ebda00e781ae333637f..acca29a7db97dc042cdb53cbe9c76e6fe0c8a7b0 100644
--- a/cpu/Makefile
+++ b/cpu/Makefile
@@ -24,15 +24,14 @@ endif
 cpus: $(DIRS)
 
 $(DIRS): 
-	@$(MAKE) -C $@
+	@"$(MAKE)" -C $@
 
 clean:
-	@$(MAKE) -C lpc2387 clean
-	@$(MAKE) -C mc1322x clean
-	@$(MAKE) -C lpc_common clean
-	@$(MAKE) -C arm_common clean
-	@$(MAKE) -C cc430 clean
-	@$(MAKE) -C msp430-common clean
-	@$(MAKE) -C msp430x16x clean
-	@$(MAKE) -C native clean
-
+	@"$(MAKE)" -C lpc2387 clean
+	@"$(MAKE)" -C mc1322x clean
+	@"$(MAKE)" -C lpc_common clean
+	@"$(MAKE)" -C arm_common clean
+	@"$(MAKE)" -C cc430 clean
+	@"$(MAKE)" -C msp430-common clean
+	@"$(MAKE)" -C msp430x16x clean
+	@"$(MAKE)" -C native clean
diff --git a/cpu/cc430/Makefile b/cpu/cc430/Makefile
index 52c5485470cd620b7a6053a74a479dc3058239c4..7a82d0ad6880aeed4eaeca90876bf5c6ede28805 100644
--- a/cpu/cc430/Makefile
+++ b/cpu/cc430/Makefile
@@ -5,10 +5,10 @@ INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/mc1322x/Makefile b/cpu/mc1322x/Makefile
index 29e6928ccc3b5ff64b1cc1e81a49dc833770180f..706aac84a56c7327f30d850b8cd90c654d1d9e1d 100644
--- a/cpu/mc1322x/Makefile
+++ b/cpu/mc1322x/Makefile
@@ -9,10 +9,10 @@ ifneq (,$(findstring mc1322x_asm,$(USEMODULE)))
 endif
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/msp430-common/Makefile b/cpu/msp430-common/Makefile
index 6a87c63be949ca9b74f5b344c91a5fce99c74d99..0a92437f979a42ab11fc9f92b8ea3e5a30e0c30c 100644
--- a/cpu/msp430-common/Makefile
+++ b/cpu/msp430-common/Makefile
@@ -4,10 +4,10 @@ INCLUDES += -Iinclude -I$(RIOTBASE)/core/include/ -I$(RIOTBOARD)/$(BOARD)/includ
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/msp430x16x/Makefile b/cpu/msp430x16x/Makefile
index bfc3c1924fb164f514b08dfb97ab74461d67b3dc..421e3af303a40ecdc1fbb32601082bdb1200a127 100644
--- a/cpu/msp430x16x/Makefile
+++ b/cpu/msp430x16x/Makefile
@@ -4,10 +4,10 @@ INCLUDES = -I../include -I$(RIOTBASE)/core/include
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/cpu/native/Makefile b/cpu/native/Makefile
index 2c6f560a347d57ae21455710f957dabe3ba23caf..20840d66c5b7fe3e83b570c7f01fbd6718483992 100644
--- a/cpu/native/Makefile
+++ b/cpu/native/Makefile
@@ -10,10 +10,10 @@ ifneq (,$(findstring nativenet,$(USEMODULE)))
 endif
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/drivers/Makefile b/drivers/Makefile
index ec29c55335ca12eec94de4e9beecc6c32b527da0..d2f4914a21d0a84f3aca6d2e16d8931b8a99eed5 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -48,4 +48,3 @@ clean::
 
 
 
-
diff --git a/drivers/at86rf231/Makefile b/drivers/at86rf231/Makefile
index 0f3fb7f2fb3b60972196224e42b6afe9a92c3563..eb4e520326f9996484a5436bfe3e3a1b8a99196a 100644
--- a/drivers/at86rf231/Makefile
+++ b/drivers/at86rf231/Makefile
@@ -4,10 +4,10 @@ MODULE =at86rf231
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/drivers/cc110x_ng/Makefile b/drivers/cc110x_ng/Makefile
index d36acedc19db20a7f2f29123a8a628fd63cb28b0..997aea9aeacc930a9d762d54223e8a8a4fe5ada2 100644
--- a/drivers/cc110x_ng/Makefile
+++ b/drivers/cc110x_ng/Makefile
@@ -16,10 +16,10 @@ ifneq (,$(findstring native,$(BOARD)))
 endif
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/drivers/cc2420/Makefile b/drivers/cc2420/Makefile
index 8eac6832bf962ea11bc0bc9dde5a96ddd2268622..a672b373c25b242babaf6a5e3c56ba368a12d976 100644
--- a/drivers/cc2420/Makefile
+++ b/drivers/cc2420/Makefile
@@ -4,10 +4,10 @@ MODULE =cc2420
 DIRS =
 
 all: $(BINDIR)$(MODULE).a
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;
 
diff --git a/sys/Makefile b/sys/Makefile
index 823092558bb816bed3711a7995e6b4dc2a516633..a62c35f790b055d1e8ebb6044cd33ec19cc13265 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -87,11 +87,11 @@ ifneq (,$(findstring hashes,$(USEMODULE)))
 endif
 
 all: $(BINDIR)$(MODULE).a 
-	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i ; done ;
 
 include $(RIOTBASE)/Makefile.base
 
 # remove compilation products
 clean::
-	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
+	@for i in $(DIRS) ; do "$(MAKE)" -C $$i clean ; done ;