diff --git a/boards/z1/Makefile.dep b/boards/z1/Makefile.dep
deleted file mode 100644
index 4e36d0ff56..0000000000
--- a/boards/z1/Makefile.dep
+++ /dev/null
@@ -1 +0,0 @@
-USEMODULE += msp430_common
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
index d2546b2de3..cacdf64530 100644
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@@ -1,29 +1,17 @@
-include $(RIOTBOARD)/$(BOARD)/Makefile.dep
-## the cpu to build for
+# CPU used by this board
 export CPU = msp430fxyz
-export MCU = msp430f2617
+export CPU_MODEL = msp430f2617
 
-# toolchain config
-export PREFIX = msp430-
-export CC = $(PREFIX)gcc
-export AR = $(PREFIX)ar
-export CFLAGS += -std=c99 -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 $(BINDIR)msp430_common/startup.o
-export TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm
-export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl
-export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
-export OFLAGS = -O ihex
-
-export PORT_LINUX ?= /dev/ttyUSB0
-export PORT_DARWIN ?= /dev/tty.SLAB_USBtoUART
+# 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 INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
-export INCLUDES += -I $(RIOTCPU)/msp430-common/include
+# setup flash tool
+export OFLAGS = -O ihex
+export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl
+export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
 
-export UNDEF += $(BINDIR)msp430_common/startup.o
+# include the msp430 common Makefile
+include $(RIOTBOARD)/Makefile.include.msp430_common