diff --git a/boards/wsn430-common/board_init.c b/boards/wsn430-common/board_init.c
index 25f1ab6367..a1489888a4 100644
--- a/boards/wsn430-common/board_init.c
+++ b/boards/wsn430-common/board_init.c
@@ -8,6 +8,7 @@
  */
 
 #include "cpu.h"
+#include "irq.h"
 #include "board.h"
 #include "kernel_internal.h"
 #include "msp430.h"
@@ -86,8 +87,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;
@@ -108,7 +108,7 @@ void msp430_set_cpu_speed(uint32_t speed)
     //URCTL0 |= URXEIE;            // allow chars to interrupt
     IE1  |= URXIE0;                // enable rx interrupt
     IFG1 &= ~UTXIFG0;
-    eint();
+    enableIRQ();
 }
 
 /*---------------------------------------------------------------------------*/
diff --git a/boards/wsn430-common/wsn430-uart0.c b/boards/wsn430-common/wsn430-uart0.c
index 4188bcec0b..0ab72919e7 100644
--- a/boards/wsn430-common/wsn430-uart0.c
+++ b/boards/wsn430-common/wsn430-uart0.c
@@ -43,7 +43,7 @@ void usart0irq(void);
 /**
  * \brief the interrupt function
  */
-interrupt(USART0RX_VECTOR) usart0irq(void) {
+void __attribute__((interrupt(USART0RX_VECTOR))) usart0irq(void) {
     volatile int dummy = 0;
     /* Check status register for receive errors. */
     if(U0RCTL & RXERR) {