diff --git a/board/msba2-common/Jamfile b/board/msba2-common/Jamfile
index 8b3d8febcc..ed2adc5647 100644
--- a/board/msba2-common/Jamfile
+++ b/board/msba2-common/Jamfile
@@ -1,6 +1,7 @@
 SubDir TOP board msba2-common ;
 
 Module board_common : board_common_init.c ;
+Module config : config.c ;
 
 SubInclude TOP board msba2-common drivers ;
 
diff --git a/board/msba2-common/board_common_init.c b/board/msba2-common/board_common_init.c
index 0823a71bc9..8d7c359625 100644
--- a/board/msba2-common/board_common_init.c
+++ b/board/msba2-common/board_common_init.c
@@ -51,12 +51,6 @@ and the mailinglist (subscription via web site)
 #define PCRTC         BIT9
 #define CL_CPU_DIV    4
 
-config_t sysconfig  = {
-    0,      ///< default ID
-    0,      ///< default radio address
-    0,      ///< default radio channel
-};
-
 /*---------------------------------------------------------------------------*/
 /**
  * @brief   Enabling MAM and setting number of clocks used for Flash memory fetch
@@ -129,32 +123,3 @@ void bl_init_clks(void)
     init_mam();
 }
 
-void loop_delay(void) {
-    volatile uint16_t i, j;
-    for (i = 1; i < 30; i++) {
-        for (j = 1; j != 0; j++) {
-            asm volatile (" nop ");
-        }
-    }
-}
-
-/*void bl_blink(void) {
-    LED_RED_ON;
-    LED_GREEN_ON;
-    
-    loop_delay();
-
-    LED_RED_OFF;
-    LED_GREEN_OFF;
-}*/
-
-// void bl_config_init(void) {
-//     extern char configmem[];
-//    if (*((uint16_t*) configmem) ==  CONFIG_KEY) {
-//        memcpy(&sysconfig, (configmem + sizeof(CONFIG_KEY)), sizeof(sysconfig));
-//        LED_GREEN_TOGGLE;
-//    }
-//    else {
-//        config_save();
-//    }
-// }
diff --git a/board/msba2-common/drivers/Jamfile b/board/msba2-common/drivers/Jamfile
index 9637982162..c0f4138ab9 100644
--- a/board/msba2-common/drivers/Jamfile
+++ b/board/msba2-common/drivers/Jamfile
@@ -1,5 +1,6 @@
 SubDir TOP board msba2-common drivers ;
 
-Module board_cc1100 : msba2-cc1100.c ;
+Module board_cc1100 : msba2-cc1100.c : cc110x_spi gpioint ;
 Module board_ltc4150 : msba2-ltc4150.c : gpioint ;
 Module board_uart : msba2-uart0.c : chardev_thread ringbuffer ;
+
diff --git a/board/msba2/Jamfile b/board/msba2/Jamfile
index 553522ba68..6e74471b63 100644
--- a/board/msba2/Jamfile
+++ b/board/msba2/Jamfile
@@ -30,7 +30,5 @@ SubDir TOP board $(BOARD) ;
 Module board : board_init.c : board_common board_uart ;
 UseModule board ;
 
-Module config : config.c ;
-
 SubInclude TOP board $(BOARD)-common ;
 SubInclude TOP cpu $(CPU) ;
diff --git a/drivers/cc110x_ng/Jamfile b/drivers/cc110x_ng/Jamfile
index f3c0bc934b..c6497672f0 100755
--- a/drivers/cc110x_ng/Jamfile
+++ b/drivers/cc110x_ng/Jamfile
@@ -29,6 +29,6 @@ SubDir TOP drivers cc110x_ng ;
 
 HDRS += $(TOP)/drivers/cc110x_ng ; 
 
-Module cc110x_ng : cc1100.c cc1100-rx.c cc1100-tx.c cc1100-defaultSettings.c : hwtimer board_cc1100 ;
+Module cc110x_ng : cc1100.c cc1100-rx.c cc1100-tx.c cc1100-defaultSettings.c : hwtimer board_cc1100 config ;
 Module cc110x_spi : cc1100_spi.c ;
 Module cc110x_cc430 : cc1100_cc430.c ;