diff --git a/eZ430-Chronos/Jamrules.eZ430-Chronos b/eZ430-Chronos/Jamrules.eZ430-Chronos
index eef3a03017..74e57f0929 100644
--- a/eZ430-Chronos/Jamrules.eZ430-Chronos
+++ b/eZ430-Chronos/Jamrules.eZ430-Chronos
@@ -4,7 +4,7 @@
 # $Id$
 
 BOARD = eZ430-Chronos ;
-CPU = msp430 ;
+CPU = cc430 ;
 MCU = cc430x6137 ;
 
 FLASHER ?= mspdebug ;
diff --git a/eZ430-Chronos/board_init.c b/eZ430-Chronos/board_init.c
index aa52e65af9..74799abace 100644
--- a/eZ430-Chronos/board_init.c
+++ b/eZ430-Chronos/board_init.c
@@ -1,2 +1,74 @@
-void board_init() {
+#include <stdint.h>
+#include <board.h>
+#include <cpu.h>
+#include <irq.h>
+
+void cc430_cpu_init(void) {
+    volatile uint16_t i;
+    volatile unsigned char *ptr;
+
+    /* disable watchdog */
+    WDTCTL = WDTPW + WDTHOLD;
+
+    // ---------------------------------------------------------------------
+    // Enable 32kHz ACLK    
+    P5SEL |= 0x03;                            // Select XIN, XOUT on P5.0 and P5.1
+    UCSCTL6 &= ~XT1OFF;                       // XT1 On, Highest drive strength
+    UCSCTL6 |= XCAP_3;                        // Internal load cap
+
+    UCSCTL3 = SELA__XT1CLK;                   // Select XT1 as FLL reference
+    UCSCTL4 = SELA__XT1CLK | SELS__DCOCLKDIV | SELM__DCOCLKDIV;
+
+    // ---------------------------------------------------------------------
+    // Configure CPU clock for 12MHz
+    _BIS_SR(SCG0);                  // Disable the FLL control loop
+    UCSCTL0 = 0x0000;          // Set lowest possible DCOx, MODx
+    UCSCTL1 = DCORSEL_5;       // Select suitable range
+    UCSCTL2 = FLLD_1 + 0x16E;  // Set DCO Multiplier
+    _BIC_SR(SCG0);                  // Enable the FLL control loop
+
+    // Worst-case settling time for the DCO when the DCO range bits have been
+    // changed is n x 32 x 32 x f_MCLK / f_FLL_reference. See UCS chapter in 5xx
+    // UG for optimization.
+    // 32 x 32 x 8 MHz / 32,768 Hz = 250000 = MCLK cycles for DCO to settle
+	for (i = 0xFF; i > 0; i--); // Time for flag to set
+
+    // Loop until XT1 & DCO stabilizes, use do-while to insure that 
+    // body is executed at least once
+    do
+    {
+        UCSCTL7 &= ~(XT2OFFG + XT1LFOFFG + XT1HFOFFG + DCOFFG);
+        SFRIFG1 &= ~OFIFG;                      // Clear fault flags
+    } while ((SFRIFG1 & OFIFG));
+
+    // Disable all interrupts
+    __disable_interrupt();
+    // Get write-access to port mapping registers:
+    PMAPPWD = 0x02D52;
+    // Allow reconfiguration during runtime:
+    PMAPCTL = PMAPRECFG;
+
+    // P2.7 = TA0CCR1A or TA1CCR0A output (buzzer output)
+    ptr  = &P2MAP0;
+    *(ptr+7) = PM_TA1CCR0A;
+    P2OUT &= ~BIT7;
+    P2DIR |= BIT7;
+
+    // P1.5 = SPI MISO input
+    ptr  = &P1MAP0;
+    *(ptr+5) = PM_UCA0SOMI;
+    // P1.6 = SPI MOSI output
+    *(ptr+6) = PM_UCA0SIMO;
+    // P1.7 = SPI CLK output
+    *(ptr+7) = PM_UCA0CLK;
+
+    // Disable write-access to port mapping registers:
+    PMAPPWD = 0;
+    // Re-enable all interrupts
+    enableIRQ();
+ 
+}
+
+void board_init() {
+    cc430_cpu_init();
 }
diff --git a/msb-430-common/Jamrules.msb-430-common b/msb-430-common/Jamrules.msb-430-common
index 9c51cd21db..7eee8b088f 100644
--- a/msb-430-common/Jamrules.msb-430-common
+++ b/msb-430-common/Jamrules.msb-430-common
@@ -25,7 +25,7 @@
 # ******************************************************************************
 # $Id$
 
-CPU = msp430 ;
+CPU = msp430x16x ;
 MCU = msp430x1612 ;
 
 FLASH_PORT ?= "$(PORT)" ;
diff --git a/msb-430h/Jamfile b/msb-430h/Jamfile
index 79e6f920c0..15f7ba97f9 100644
--- a/msb-430h/Jamfile
+++ b/msb-430h/Jamfile
@@ -31,4 +31,3 @@ Module board_cc1100 : driver_cc1100.c ;
 
 SubInclude TOP board msb-430-common ;
 SubInclude TOP cpu $(CPU) ;
-