diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430
index 3c021700f..796a8fd31 100644
--- a/cpu/msp430/Makefile.msp430
+++ b/cpu/msp430/Makefile.msp430
@@ -41,7 +41,7 @@ IAR_PATH_C = $(shell dirname "$(IAR_BIN_PATH)")
 IAR_PATH = $(shell cygpath -m "$(IAR_PATH_C)")
 endif
 
-CFLAGSNO = --dlib_config "$(IAR_PATH)/LIB/DLIB/dl430xlfn.h" -Ohz --multiplier=32 --multiplier_location=4C0 --hw_workaround=CPU40 --core=430X $(CFLAGSWERROR) --data_model small --double=32
+CFLAGSNO = --dlib_config "$(IAR_PATH)/LIB/DLIB/dl430xlfn.h" $(CFLAGSWERROR)
 # CFLAGSNO = --dlib_config $(IAR_PATH)/LIB/DLIB/dl430xlfn.h -Ohz --multiplier=32 --multiplier_location=4C0 --hw_workaround=CPU40 --core=430X $(CFLAGSWERROR) --data_model large --double=32
 CUSTOM_RULE_C_TO_O = 1
 %.o: %.c
@@ -56,8 +56,6 @@ CUSTOM_RULE_C_TO_CO = 1
 	$(CC) $(CFLAGS) -DAUTOSTART_ENABLE $< -o $@
 
 AROPTS = -o
-LDFLAGS += -B -xm "$(IAR_PATH)/lib/dlib/dl430xsfn.r43" -f "$(IAR_PATH)/config/lnk430f5437.xcl" -l contiki-$(TARGET).map -Fintel-extended -s __program_start -D_STACK_SIZE=80 -D_DATA16_HEAP_SIZE=80 -D_DATA20_HEAP_SIZE=80
-
 
 else
 GCC      = 1
diff --git a/platform/z1/Makefile.common b/platform/z1/Makefile.common
index 8b27f320a..26a9c4783 100644
--- a/platform/z1/Makefile.common
+++ b/platform/z1/Makefile.common
@@ -7,7 +7,7 @@ CFLAGS+=-Os -g
 endif
 
 ifdef IAR
-CFLAGS+=-e --vla
+CFLAGS+=-e --vla -Ohz --multiplier=16s --core=430X  --data_model small --double=32
 endif
 
 CLEAN += symbols.c symbols.h
@@ -42,6 +42,11 @@ CONTIKI_TARGET_SOURCEFILES += contiki-z1-platform.c
 MCU=msp430x2617
 include $(CONTIKI)/cpu/msp430/Makefile.msp430
 
+# Add LDFLAGS after IAR_PATH is set
+ifdef IAR
+LDFLAGS += -B -xm "$(IAR_PATH)/lib/dlib/dl430xsfn.r43" -f "$(IAR_PATH)/config/lnk430f2617.xcl" -l contiki-$(TARGET).map -Fintel-extended -s __program_start -D_STACK_SIZE=80 -D_DATA16_HEAP_SIZE=80 -D_DATA20_HEAP_SIZE=80
+endif
+
 contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}
 #	$(AR) rcf $@ $^