diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index af3734e43dce12071aed1ca403a99c9660ad908c..751e7b0d39375f0140b65e477def435ccc06277f 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -7,7 +7,4 @@ export OFLAGS = -O ihex
 export FLASHER = mspdebug
 export FFLAGS = rf2500 "prog $(HEXFILE)"
 
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
-
 INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include
diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index 14a69653e7246f6734056b70a9068df3f5ec06d9..f20ca282b12caad37572463c995bc6ff9c8dd057 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -24,9 +24,6 @@ export DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
 export DEBUGGER = $(PREFIX)gdb
 export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt"  $(ELFFILE)
 
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
-
 # export msb-430-common includes
 export INCLUDES += -I$(RIOTBOARD)/msb-430-common/include
 export INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index dee5865eaa9ed5f9b4e6aec79a3b28de137b18c5..22a5df72f7b1be07fb3e745cd2a9a16426073364 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -12,6 +12,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 export OFLAGS = -O ihex
 export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl
 export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
-
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include
index 641220d8af05e68f9fae5252d21258803c38bfd3..51ed52b66accf8a28da818ddbda8ddce169931f3 100644
--- a/boards/wsn430-common/Makefile.include
+++ b/boards/wsn430-common/Makefile.include
@@ -13,8 +13,5 @@ export OFLAGS = -O ihex
 export FLASHER = mspdebug
 export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
 
-# include msp430 base makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
-
 # include wsn430-common includes
 export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
index cacdf645302bcf6d202aa673c2612fd8cab519b0..b909dd2e8592fb5396a62d81cd9d93a86122496c 100644
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@@ -12,6 +12,3 @@ include $(RIOTBOARD)/Makefile.include.serial
 export OFLAGS = -O ihex
 export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl
 export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
-
-# include the msp430 common Makefile
-include $(RIOTBOARD)/Makefile.include.msp430_common
diff --git a/boards/Makefile.include.msp430_common b/cpu/Makefile.include.msp430_common
similarity index 100%
rename from boards/Makefile.include.msp430_common
rename to cpu/Makefile.include.msp430_common
diff --git a/cpu/msp430-common/Makefile.include b/cpu/msp430-common/Makefile.include
index 482487382c6eb0af133c53e84e88e59340d7c9c2..c82d22e33173cf314c4445d2a3a9e64dd8603e9d 100644
--- a/cpu/msp430-common/Makefile.include
+++ b/cpu/msp430-common/Makefile.include
@@ -4,3 +4,6 @@ export UNDEF += $(BINDIR)msp430_common/startup.o
 export USEMODULE += msp430_common
 
 DEFAULT_MODULE += oneway_malloc
+
+# include the msp430 common Makefile
+include $(RIOTCPU)/Makefile.include.msp430_common