diff --git a/hw/bsp/msp_exp430f5529lp/board.mk b/hw/bsp/msp_exp430f5529lp/board.mk
index ec393e0f..b1264d34 100644
--- a/hw/bsp/msp_exp430f5529lp/board.mk
+++ b/hw/bsp/msp_exp430f5529lp/board.mk
@@ -16,11 +16,17 @@ INC += $(TOP)/hw/mcu/ti/msp430/msp430-gcc-support-files/include
 VENDOR = ti
 CHIP_FAMILY = msp430x5xx
 
+# Allow user to use mspdebug if set on make command line.
+ifdef MSPDEBUG
+# flash target using mspdebug.
+flash: $(BUILD)/$(BOARD)-firmware.elf
+	$(MSPDEBUG) tilib "prog $<" --allow-fw-update
+else
 # export for libmsp430.so to same installation
 export LD_LIBRARY_PATH=$(dir $(shell which MSP430Flasher))
-
 # flash target using TI MSP430-Flasher
 # http://www.ti.com/tool/MSP430-FLASHER
 # Please add its installation dir to PATH
 flash: $(BUILD)/$(BOARD)-firmware.hex
 	MSP430Flasher -w $< -z [VCC]
+endif