diff --git a/boards/OLIMEX_MSP430_P1611/board.c b/boards/OLIMEX_MSP430_P1611/board.c
index 072b1dd5a..558110376 100644
--- a/boards/OLIMEX_MSP430_P1611/board.c
+++ b/boards/OLIMEX_MSP430_P1611/board.c
@@ -61,15 +61,9 @@ CH_IRQ_HANDLER(TIMERA0_VECTOR) {
 }
 
 /*
- * Hardware initialization goes here.
- * NOTE: Interrupts are still disabled.
+ * Board-specific initialization code.
  */
-void hwinit(void) {
-
-  /*
-   * HAL initialization.
-   */
-  halInit();
+void boardInit(void) {
 
   /*
    * Timer 0 setup, uses SMCLK as source.
diff --git a/boards/OLIMEX_MSP430_P1611/board.h b/boards/OLIMEX_MSP430_P1611/board.h
index 34d625994..c445c5b6e 100644
--- a/boards/OLIMEX_MSP430_P1611/board.h
+++ b/boards/OLIMEX_MSP430_P1611/board.h
@@ -70,12 +70,14 @@
 #define VAL_P6OUT       P6_O_LED_MASK
 #define VAL_P6DIR       ~P6_I_BUTTON_MASK
 
+#if !defined(_FROM_ASM_)
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void hwinit(void);
+  void boardInit(void);
 #ifdef __cplusplus
 }
 #endif
+#endif /* _FROM_ASM_ */
 
 #endif /* _BOARD_H_ */
diff --git a/demos/MSP430-MSP430x1611-GCC/main.c b/demos/MSP430-MSP430x1611-GCC/main.c
index 3bac249d0..c010b89b3 100644
--- a/demos/MSP430-MSP430x1611-GCC/main.c
+++ b/demos/MSP430-MSP430x1611-GCC/main.c
@@ -38,7 +38,7 @@ static msg_t Thread1(void *arg) {
 }
 
 /*
- * Entry point, the interrupts are disabled on entry.
+ * Application entry point.
  */
 int main(int argc, char **argv) {
 
@@ -46,9 +46,14 @@ int main(int argc, char **argv) {
   (void)argv;
 
   /*
-   * Hardware initialization, see board.c.
+   * System initializations.
+   * - HAL initialization, this also initializes the configured device drivers
+   *   and performs the board-specific initializations.
+   * - Kernel initialization, the main() function becomes a thread and the
+   *   RTOS is active.
    */
-  hwinit();
+  halInit();
+  chSysInit();
 
   /*
    * Activates the serial driver 2 using the driver default configuration.
diff --git a/demos/MSP430-MSP430x1611-GCC/mcuconf.h b/demos/MSP430-MSP430x1611-GCC/mcuconf.h
index 72c180648..c79252c86 100644
--- a/demos/MSP430-MSP430x1611-GCC/mcuconf.h
+++ b/demos/MSP430-MSP430x1611-GCC/mcuconf.h
@@ -28,7 +28,7 @@
 /*
  * HAL driver system settings.
  */
-#define MSP430_USE_CLOCK            MSP430_CLOCK_SOURCE_XT2CLK
+#define MSP430_USE_CLOCK            MSP430_CLOCK_SOURCE_DCOCLK
 
 /*
  * ADC driver system settings.
diff --git a/docs/reports/MSP430F1611-0.75.txt b/docs/reports/MSP430F1611-0.75.txt
index f025cd811..39ff47b54 100644
--- a/docs/reports/MSP430F1611-0.75.txt
+++ b/docs/reports/MSP430F1611-0.75.txt
@@ -5,7 +5,7 @@ Settings: MCLK=DCOCLK 750KHz
 
 *** ChibiOS/RT test suite
 ***
-*** Kernel:       2.1.4unstable
+*** Kernel:       2.1.6unstable
 *** GCC Version:  3.2.3
 *** Architecture: MSP430
 *** Core Variant: MSP430
diff --git a/docs/reports/MSP430F1611-8.txt b/docs/reports/MSP430F1611-8.txt
index c960cc481..804290409 100644
--- a/docs/reports/MSP430F1611-8.txt
+++ b/docs/reports/MSP430F1611-8.txt
@@ -5,7 +5,7 @@ Settings: MCLK=XT2CLK 8MHz
 
 *** ChibiOS/RT test suite
 ***
-*** Kernel:       2.1.4unstable
+*** Kernel:       2.1.6unstable
 *** GCC Version:  3.2.3
 *** Architecture: MSP430
 *** Core Variant: MSP430