diff --git a/.gitmodules b/.gitmodules
index 6d00120..ffaec9b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "RIOT"]
 	path = RIOT
 	url = git://github.com/RIOT-OS/RIOT.git
+[submodule "boards"]
+	path = boards
+	url = git@github.com:RIOT-OS/boards.git
diff --git a/boards b/boards
new file mode 160000
index 0000000..eeb8c60
--- /dev/null
+++ b/boards
@@ -0,0 +1 @@
+Subproject commit eeb8c60e7e0787d70d8258c93e8f82489c6d6f3e
diff --git a/default-native/Makefile b/default-native/Makefile
index d653c05..b77354a 100644
--- a/default-native/Makefile
+++ b/default-native/Makefile
@@ -9,7 +9,7 @@ export BOARD = native
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq (,$(findstring native,$(BOARD)))
 include $(CURDIR)/../Makefile.unsupported
diff --git a/default/Makefile b/default/Makefile
index 57cd22e..59d5df1 100644
--- a/default/Makefile
+++ b/default/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
 export RIOTCPU =$(CURDIR)/../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 USEMODULE += posix
 USEMODULE += uart0
diff --git a/hello-world-blinker/Makefile b/hello-world-blinker/Makefile
index 54a2f6d..08b4cbe 100644
--- a/hello-world-blinker/Makefile
+++ b/hello-world-blinker/Makefile
@@ -17,7 +17,7 @@ endif
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/hello-world-blinker/Makefile.msb430 b/hello-world-blinker/Makefile.msb430
index 0ff3694..5ac306d 100644
--- a/hello-world-blinker/Makefile.msb430
+++ b/hello-world-blinker/Makefile.msb430
@@ -15,7 +15,7 @@ export BOARD = msb-430
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/hello-world-blinker/Makefile.msba2 b/hello-world-blinker/Makefile.msba2
index 85ded51..e0d78fb 100644
--- a/hello-world-blinker/Makefile.msba2
+++ b/hello-world-blinker/Makefile.msba2
@@ -15,7 +15,7 @@ export BOARD = msba2
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/hello-world-thread/Makefile b/hello-world-thread/Makefile
index 42f6676..ca8ecad 100644
--- a/hello-world-thread/Makefile
+++ b/hello-world-thread/Makefile
@@ -17,7 +17,7 @@ endif
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/hello-world-thread/Makefile.msb430 b/hello-world-thread/Makefile.msb430
index 0ff3694..5ac306d 100644
--- a/hello-world-thread/Makefile.msb430
+++ b/hello-world-thread/Makefile.msb430
@@ -15,7 +15,7 @@ export BOARD = msb-430
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/hello-world-thread/Makefile.msba2 b/hello-world-thread/Makefile.msba2
index 85ded51..e0d78fb 100644
--- a/hello-world-thread/Makefile.msba2
+++ b/hello-world-thread/Makefile.msba2
@@ -15,7 +15,7 @@ export BOARD = msba2
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/hello-world-timer/Makefile b/hello-world-timer/Makefile
index 42f6676..ca8ecad 100644
--- a/hello-world-timer/Makefile
+++ b/hello-world-timer/Makefile
@@ -17,7 +17,7 @@ endif
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/hello-world-timer/Makefile.msb430 b/hello-world-timer/Makefile.msb430
index 0ff3694..5ac306d 100644
--- a/hello-world-timer/Makefile.msb430
+++ b/hello-world-timer/Makefile.msb430
@@ -15,7 +15,7 @@ export BOARD = msb-430
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/hello-world-timer/Makefile.msba2 b/hello-world-timer/Makefile.msba2
index 85ded51..e0d78fb 100644
--- a/hello-world-timer/Makefile.msba2
+++ b/hello-world-timer/Makefile.msba2
@@ -15,7 +15,7 @@ export BOARD = msba2
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/hello-world/Makefile b/hello-world/Makefile
index 6b69897..e3c0108 100644
--- a/hello-world/Makefile
+++ b/hello-world/Makefile
@@ -17,7 +17,7 @@ endif
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/pingpong/Makefile b/pingpong/Makefile
index 9eebee1..df77333 100644
--- a/pingpong/Makefile
+++ b/pingpong/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
 export RIOTCPU =$(CURDIR)/../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 export INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/
 
diff --git a/pingpong_sync/Makefile b/pingpong_sync/Makefile
index 9eebee1..df77333 100644
--- a/pingpong_sync/Makefile
+++ b/pingpong_sync/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
 export RIOTCPU =$(CURDIR)/../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 export INCLUDES = -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/core/include -I$(RIOTCPU)/$(CPU)/include -I$(RIOTBASE)/sys/lib -I$(RIOTBASE)/sys/include/ -I$(RIOTBASE)/drivers/include/
 
diff --git a/sixlowpan/Makefile b/sixlowpan/Makefile
index e6d713c..4545845 100644
--- a/sixlowpan/Makefile
+++ b/sixlowpan/Makefile
@@ -21,7 +21,7 @@ else
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/test_bloom/Makefile b/test_bloom/Makefile
index f2c7bf7..f0b5ca6 100644
--- a/test_bloom/Makefile
+++ b/test_bloom/Makefile
@@ -20,7 +20,7 @@ include $(CURDIR)/../Makefile.unsupported
 else
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/test_cc110x_ng/Makefile b/test_cc110x_ng/Makefile
index b5f7881..8c55527 100644
--- a/test_cc110x_ng/Makefile
+++ b/test_cc110x_ng/Makefile
@@ -22,7 +22,7 @@ else
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 USEMODULE += config
 USEMODULE += posix
diff --git a/test_float/Makefile b/test_float/Makefile
index 46113fd..433e012 100644
--- a/test_float/Makefile
+++ b/test_float/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/test_getpid/Makefile b/test_getpid/Makefile
index 5889702..7903531 100644
--- a/test_getpid/Makefile
+++ b/test_getpid/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/test_hwtimer/Makefile b/test_hwtimer/Makefile
index 2a6de3a..013a651 100644
--- a/test_hwtimer/Makefile
+++ b/test_hwtimer/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/test_hwtimer/Makefile.native b/test_hwtimer/Makefile.native
index 8a1f221..1aeadee 100644
--- a/test_hwtimer/Makefile.native
+++ b/test_hwtimer/Makefile.native
@@ -9,7 +9,7 @@ export BOARD = native
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/test_hwtimer_basic/Makefile b/test_hwtimer_basic/Makefile
index 53d1d85..089c8f9 100644
--- a/test_hwtimer_basic/Makefile
+++ b/test_hwtimer_basic/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/test_hwtimer_basic/Makefile.native b/test_hwtimer_basic/Makefile.native
index f1cfb49..6c464ed 100644
--- a/test_hwtimer_basic/Makefile.native
+++ b/test_hwtimer_basic/Makefile.native
@@ -9,7 +9,7 @@ export BOARD = native
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/test_malloc/Makefile b/test_malloc/Makefile
index ab16a94..8850e71 100644
--- a/test_malloc/Makefile
+++ b/test_malloc/Makefile
@@ -17,7 +17,7 @@ endif
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/test_sha256/Makefile b/test_sha256/Makefile
index 80c09bb..59473db 100644
--- a/test_sha256/Makefile
+++ b/test_sha256/Makefile
@@ -17,7 +17,7 @@ endif
 
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/test_shell/Makefile b/test_shell/Makefile
index 88a9e04..2f391be 100644
--- a/test_shell/Makefile
+++ b/test_shell/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include. 
 
diff --git a/test_sleep/Makefile b/test_sleep/Makefile
index c054347..c65b10d 100644
--- a/test_sleep/Makefile
+++ b/test_sleep/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/test_thread_basic/Makefile b/test_thread_basic/Makefile
index 77a18fc..ca4ade8 100644
--- a/test_thread_basic/Makefile
+++ b/test_thread_basic/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/test_thread_exit/Makefile b/test_thread_exit/Makefile
index ab9a34a..a102e9b 100644
--- a/test_thread_exit/Makefile
+++ b/test_thread_exit/Makefile
@@ -18,7 +18,7 @@ endif
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../../RIOT
 export RIOTCPU =$(CURDIR)/../../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ifeq ($(BOARD),stm32f4discovery)
 	include Makefile.$(BOARD)
diff --git a/tlayer/Makefile b/tlayer/Makefile
index 9642d8e..0023cdb 100644
--- a/tlayer/Makefile
+++ b/tlayer/Makefile
@@ -22,7 +22,7 @@ else
 # this has to be the absolute path of the RIOT-base dir
 export RIOTBASE =$(CURDIR)/../RIOT
 export RIOTCPU =$(CURDIR)/../RIOT/cpu
-export RIOTBOARD =$(CURDIR)/../../boards
+export RIOTBOARD =$(CURDIR)/../boards
 
 ## Modules to include.