diff --git a/board/msb-430-common/Jamfile b/board/msb-430-common/Jamfile
new file mode 100644
index 0000000000..97c2be0f30
--- /dev/null
+++ b/board/msb-430-common/Jamfile
@@ -0,0 +1,33 @@
+# ******************************************************************************
+# Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
+# 
+# These sources were developed at the Freie Universitaet Berlin, Computer
+# Systems and Telematics group (http://cst.mi.fu-berlin.de).
+# ------------------------------------------------------------------------------
+# This file is part of FeuerWare.
+# 
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+# 
+# FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see http://www.gnu.org/licenses/ .
+# ------------------------------------------------------------------------------
+# For further information and questions please use the web site
+# 	http://scatterweb.mi.fu-berlin.de
+# and the mailinglist (subscription via web site)
+# 	scatterweb@lists.spline.inf.fu-berlin.de
+# ******************************************************************************
+# $Id$
+
+SubDir TOP board msb-430-common ;
+
+Module board : board_init.c debug_uart.c ;
+UseModule board ;
+
+SubInclude TOP cpu $(CPU) ;
diff --git a/board/msb-430-common/Jamrules.msb-430-common b/board/msb-430-common/Jamrules.msb-430-common
new file mode 100644
index 0000000000..db12fc6763
--- /dev/null
+++ b/board/msb-430-common/Jamrules.msb-430-common
@@ -0,0 +1,36 @@
+# ******************************************************************************
+# Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
+# 
+# These sources were developed at the Freie Universitaet Berlin, Computer
+# Systems and Telematics group (http://cst.mi.fu-berlin.de).
+# ------------------------------------------------------------------------------
+# This file is part of FeuerWare.
+# 
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+# 
+# FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see http://www.gnu.org/licenses/ .
+# ------------------------------------------------------------------------------
+# For further information and questions please use the web site
+# 	http://scatterweb.mi.fu-berlin.de
+# and the mailinglist (subscription via web site)
+# 	scatterweb@lists.spline.inf.fu-berlin.de
+# ******************************************************************************
+# $Id$
+
+CPU = msp430 ;
+MCU = msp430x1612 ;
+
+FLASH_PORT ?= /dev/ttyUSB0 ;
+FLASHER ?= mspdebug ;
+FLASHFLAGS ?= -d $(FLASH_PORT) -j uif ;
+
+RESET ?= $(FLASHER) $(FLASHFLAGS) reset ;
+
diff --git a/board/msb-430h/board_init.c b/board/msb-430-common/board_init.c
similarity index 100%
rename from board/msb-430h/board_init.c
rename to board/msb-430-common/board_init.c
diff --git a/board/msb-430h/debug_uart.c b/board/msb-430-common/debug_uart.c
similarity index 100%
rename from board/msb-430h/debug_uart.c
rename to board/msb-430-common/debug_uart.c
diff --git a/board/msb-430/Jamfile b/board/msb-430/Jamfile
new file mode 100644
index 0000000000..f2592c24cf
--- /dev/null
+++ b/board/msb-430/Jamfile
@@ -0,0 +1,32 @@
+# ******************************************************************************
+# Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
+# 
+# These sources were developed at the Freie Universitaet Berlin, Computer
+# Systems and Telematics group (http://cst.mi.fu-berlin.de).
+# ------------------------------------------------------------------------------
+# This file is part of FeuerWare.
+# 
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+# 
+# FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see http://www.gnu.org/licenses/ .
+# ------------------------------------------------------------------------------
+# For further information and questions please use the web site
+# 	http://scatterweb.mi.fu-berlin.de
+# and the mailinglist (subscription via web site)
+# 	scatterweb@lists.spline.inf.fu-berlin.de
+# ******************************************************************************
+# $Id$
+
+SubDir TOP board msb-430 ;
+
+SubInclude TOP board msb-430-common ;
+SubInclude TOP cpu $(CPU) ;
+
diff --git a/board/msb-430/Jamrules.msb-430 b/board/msb-430/Jamrules.msb-430
new file mode 100644
index 0000000000..ae1d28b444
--- /dev/null
+++ b/board/msb-430/Jamrules.msb-430
@@ -0,0 +1,3 @@
+BOARD = msb-430 ;
+
+include $(TOP)/board/msb-430-common/Jamrules.msb-430-common ; 
diff --git a/board/msb-430/include/board.h b/board/msb-430/include/board.h
new file mode 100644
index 0000000000..6ca75c9c45
--- /dev/null
+++ b/board/msb-430/include/board.h
@@ -0,0 +1,69 @@
+/******************************************************************************
+Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
+
+These sources were developed at the Freie Universitaet Berlin, Computer Systems
+and Telematics group (http://cst.mi.fu-berlin.de).
+-------------------------------------------------------------------------------
+This file is part of FeuerWare.
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program.  If not, see http://www.gnu.org/licenses/ .
+--------------------------------------------------------------------------------
+For further information and questions please use the web site
+	http://scatterweb.mi.fu-berlin.de
+and the mailinglist (subscription via web site)
+	scatterweb@lists.spline.inf.fu-berlin.de
+*******************************************************************************/
+
+#ifndef _MSB_BOARD_H
+#define _MSB_BOARD_H
+
+/**
+ * @defgroup	msb_430h		ScatterWeb MSB-430H
+ * @ingroup		msp430
+ *
+<h2>Compontents</h2>
+\li MSP430
+\li CC1100
+
+* @{
+*/
+
+/**
+ * @file
+ * @brief		MSB-430H Board
+ *
+ * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @version     $Revision$
+ *
+ * @note		$Id$
+ */
+
+//MSB430 core
+#define MSP430_INITIAL_CPU_SPEED    7372800uL
+#define MSP430_HAS_DCOR             1
+#define MSP430_HAS_EXTERNAL_CRYSTAL 0
+
+/* LEDs ports MSB430 */
+#define LEDS_PxDIR P5DIR
+#define LEDS_PxOUT P5OUT
+#define LEDS_CONF_RED		0x80
+#define LEDS_CONF_GREEN		0x00
+#define LEDS_CONF_YELLOW	0x00
+
+#define RED_ON      LEDS_PxOUT &=~LEDS_CONF_RED
+#define RED_OFF     LEDS_PxOUT |= LEDS_CONF_RED
+
+#include <msp430x16x.h>
+
+/** @} */
+#endif // _MSB_BOARD_H
diff --git a/board/msb-430h/Jamfile b/board/msb-430h/Jamfile
index b1181a57db..79e6f920c0 100644
--- a/board/msb-430h/Jamfile
+++ b/board/msb-430h/Jamfile
@@ -27,9 +27,8 @@
 
 SubDir TOP board msb-430h ;
 
-Module board : board_init.c debug_uart.c ;
-UseModule board ;
-
 Module board_cc1100 : driver_cc1100.c ;
 
+SubInclude TOP board msb-430-common ;
 SubInclude TOP cpu $(CPU) ;
+
diff --git a/board/msb-430h/Jamrules.msb-430h b/board/msb-430h/Jamrules.msb-430h
index 41bf0779d9..d1913ed542 100644
--- a/board/msb-430h/Jamrules.msb-430h
+++ b/board/msb-430h/Jamrules.msb-430h
@@ -1,37 +1,3 @@
-# ******************************************************************************
-# Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
-# 
-# These sources were developed at the Freie Universitaet Berlin, Computer
-# Systems and Telematics group (http://cst.mi.fu-berlin.de).
-# ------------------------------------------------------------------------------
-# This file is part of FeuerWare.
-# 
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, either version 3 of the License, or (at your option) any later
-# version.
-# 
-# FeuerWare is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along with
-# this program.  If not, see http://www.gnu.org/licenses/ .
-# ------------------------------------------------------------------------------
-# For further information and questions please use the web site
-# 	http://scatterweb.mi.fu-berlin.de
-# and the mailinglist (subscription via web site)
-# 	scatterweb@lists.spline.inf.fu-berlin.de
-# ******************************************************************************
-# $Id$
-
 BOARD = msb-430h ;
-CPU = msp430 ;
-MCU = msp430x1612 ;
-
-FLASH_PORT ?= /dev/ttyUSB0 ;
-FLASHER ?= mspdebug ;
-FLASHFLAGS ?= -d $(FLASH_PORT) -j uif ;
-
-RESET ?= $(FLASHER) $(FLASHFLAGS) reset ;
 
+include $(TOP)/board/msb-430-common/Jamrules.msb-430-common ;