diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index 62162174c58b7a81208213ae5f1a1ccae9effb7c..14a69653e7246f6734056b70a9068df3f5ec06d9 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -1,37 +1,32 @@
 ## the cpu to build for
 export CPU = msp430fxyz
-export MCU = msp430f1612
+export CPU_MODEL = msp430f1612
 
-# toolchain config
-export PREFIX = msp430-
-export CC = $(PREFIX)gcc
-export AR = $(PREFIX)ar
-export CFLAGS += -Wstrict-prototypes -gdwarf-2 -Os -Wall -mmcu=$(MCU)
-export ASFLAGS += -mmcu=$(MCU) --defsym $(MCU)=1 --gdwarf-2
-export AS = $(PREFIX)as
-export LINK = $(PREFIX)gcc
-export SIZE = $(PREFIX)size
-export OBJCOPY = $(PREFIX)objcopy
-export LINKFLAGS += -mmcu=$(MCU) -lgcc
-TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm
+# set default port depending on operating system
+PORT_LINUX ?= /dev/ttyUSB0
+PORT_DARWIN ?= $(shell ls -1 /dev/tty.SLAB_USBtoUART* | head -n 1)
+# setup serial terminal
+include $(RIOTBOARD)/Makefile.include.serial
 
-export FLASHER ?= mspdebug
-export PORT ?= /dev/ttyUSB0
+# setup flash tool
+export OFLAGS = -O ihex
 export PROGRAMMER ?= olimex
 export MSPDEBUGFLAGS += -j $(PROGRAMMER)
 ifeq ($(strip $(PROGRAMMER)),uif)
-	export MSPDEBUGFLAGS += -d $(PORT)
+    export MSPDEBUGFLAGS += -d $(PORT)
 endif
+export FLASHER ?= mspdebug
+export FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"
+
+# setup debugger
 export DEBUGSERVER = $(FLASHER)
 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)
-export TERMFLAGS += -p "$(PORT)"
-
-export FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"
 
-export USEMODULE += msp430_common
-export INCLUDES += -I$(RIOTCPU)/msp430-common/include/ -I$(RIOTBOARD)/msb-430-common/include -I$(RIOTBOARD)/msb-430-common/drivers/include
-export OFLAGS = -O ihex
+# include msp430 base makefile
+include $(RIOTBOARD)/Makefile.include.msp430_common
 
-export UNDEF += $(BINDIR)msp430_common/startup.o
+# 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/msb-430/Makefile.include b/boards/msb-430/Makefile.include
index b16394458f0175541304e529803e461b7a2af102..c42b46b0632cf43832cdc0830a21090664cb0fe3 100644
--- a/boards/msb-430/Makefile.include
+++ b/boards/msb-430/Makefile.include
@@ -1,2 +1 @@
-export INCLUDES += -I$(RIOTBOARD)/msb-430/include
 include $(RIOTBOARD)/msb-430-common/Makefile.include
diff --git a/boards/msb-430h/Makefile.dep b/boards/msb-430h/Makefile.dep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/boards/msb-430h/Makefile.include b/boards/msb-430h/Makefile.include
index 10ae0808755e310a92572c300ad80b640b9551b0..c42b46b0632cf43832cdc0830a21090664cb0fe3 100644
--- a/boards/msb-430h/Makefile.include
+++ b/boards/msb-430h/Makefile.include
@@ -1,4 +1 @@
-export INCLUDES += -I$(RIOTBOARD)/msb-430h/include
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
-
 include $(RIOTBOARD)/msb-430-common/Makefile.include