diff --git a/boards/msb-430-common/board_init.c b/boards/msb-430-common/board_init.c
index ca02d766b6..b0062625d8 100644
--- a/boards/msb-430-common/board_init.c
+++ b/boards/msb-430-common/board_init.c
@@ -21,6 +21,7 @@
  */
 
 #include "cpu.h"
+#include "irq.h"
 #include "board.h"
 #include "kernel_internal.h"
 #include "msp430.h"
@@ -130,7 +131,7 @@ static void msb_ports_init(void)
 
 void msp430_set_cpu_speed(uint32_t speed)
 {
-    dint();
+    disableIRQ();
     __msp430_cpu_speed = speed;
     msp430_init_dco();
     uint16_t br;
@@ -148,7 +149,7 @@ void msp430_set_cpu_speed(uint32_t speed)
 
     IE2 |= URXIE1;
     //clock_init();
-    eint();
+    enableIRQ();
 }
 
 /*---------------------------------------------------------------------------*/
diff --git a/boards/msb-430-common/uart1.c b/boards/msb-430-common/uart1.c
index 580e249f1e..82a5b4e551 100644
--- a/boards/msb-430-common/uart1.c
+++ b/boards/msb-430-common/uart1.c
@@ -53,7 +53,7 @@ void usart0irq(void);
 /**
  * \brief the interrupt function
  */
-interrupt(USART1RX_VECTOR) usart0irq(void)
+void __attribute__((interrupt(USART1RX_VECTOR))) usart0irq(void)
 {
     U1TCTL &= ~URXSE; /* Clear the URXS signal */
     U1TCTL |= URXSE;  /* Re-enable URXS - needed here?*/