diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29e5a15a9e..4ef0b8fa6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -413,6 +413,10 @@ add_subdirectory(src/modules/systemlib EXCLUDE_FROM_ALL) # TODO: split into libr
 add_subdirectory(src/modules/uORB EXCLUDE_FROM_ALL) # TODO: platform layer
 add_subdirectory(src/drivers/boards EXCLUDE_FROM_ALL)
 
+if(EXISTS "${PX4_BOARD_DIR}/CMakeLists.txt")
+	add_subdirectory(${PX4_BOARD_DIR})
+endif()
+
 foreach(module ${config_module_list})
 	add_subdirectory(src/${module})
 endforeach()
diff --git a/boards/bitcraze/crazyflie/CMakeLists.txt b/boards/bitcraze/crazyflie/CMakeLists.txt
new file mode 100644
index 0000000000..4fda6f229e
--- /dev/null
+++ b/boards/bitcraze/crazyflie/CMakeLists.txt
@@ -0,0 +1,34 @@
+############################################################################
+#
+#   Copyright (c) 2018 PX4 Development Team. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name PX4 nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+add_subdirectory(syslink)
diff --git a/boards/bitcraze/crazyflie/default.cmake b/boards/bitcraze/crazyflie/default.cmake
index 836b99d94f..6e6cee059e 100644
--- a/boards/bitcraze/crazyflie/default.cmake
+++ b/boards/bitcraze/crazyflie/default.cmake
@@ -38,7 +38,6 @@ px4_add_board(
 		navigator
 		position_estimator_inav
 		sensors
-		syslink
 		#uavcan
 		#vtol_att_control
 		wind_estimator
diff --git a/src/modules/syslink/CMakeLists.txt b/boards/bitcraze/crazyflie/syslink/CMakeLists.txt
similarity index 100%
rename from src/modules/syslink/CMakeLists.txt
rename to boards/bitcraze/crazyflie/syslink/CMakeLists.txt
index 1385ee645d..e6dff91b9b 100644
--- a/src/modules/syslink/CMakeLists.txt
+++ b/boards/bitcraze/crazyflie/syslink/CMakeLists.txt
@@ -30,6 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 ############################################################################
+
 px4_add_module(
 	MODULE modules__syslink
 	MAIN syslink
@@ -42,4 +43,3 @@ px4_add_module(
 		syslink.c
 	DEPENDS
 	)
-
diff --git a/src/modules/syslink/crtp.h b/boards/bitcraze/crazyflie/syslink/crtp.h
similarity index 100%
rename from src/modules/syslink/crtp.h
rename to boards/bitcraze/crazyflie/syslink/crtp.h
diff --git a/src/modules/syslink/drv_deck.h b/boards/bitcraze/crazyflie/syslink/drv_deck.h
similarity index 100%
rename from src/modules/syslink/drv_deck.h
rename to boards/bitcraze/crazyflie/syslink/drv_deck.h
diff --git a/src/modules/syslink/syslink.c b/boards/bitcraze/crazyflie/syslink/syslink.c
similarity index 100%
rename from src/modules/syslink/syslink.c
rename to boards/bitcraze/crazyflie/syslink/syslink.c
diff --git a/src/modules/syslink/syslink.h b/boards/bitcraze/crazyflie/syslink/syslink.h
similarity index 100%
rename from src/modules/syslink/syslink.h
rename to boards/bitcraze/crazyflie/syslink/syslink.h
diff --git a/src/modules/syslink/syslink_bridge.cpp b/boards/bitcraze/crazyflie/syslink/syslink_bridge.cpp
similarity index 100%
rename from src/modules/syslink/syslink_bridge.cpp
rename to boards/bitcraze/crazyflie/syslink/syslink_bridge.cpp
diff --git a/src/modules/syslink/syslink_main.cpp b/boards/bitcraze/crazyflie/syslink/syslink_main.cpp
similarity index 100%
rename from src/modules/syslink/syslink_main.cpp
rename to boards/bitcraze/crazyflie/syslink/syslink_main.cpp
diff --git a/src/modules/syslink/syslink_main.h b/boards/bitcraze/crazyflie/syslink/syslink_main.h
similarity index 100%
rename from src/modules/syslink/syslink_main.h
rename to boards/bitcraze/crazyflie/syslink/syslink_main.h
diff --git a/src/modules/syslink/syslink_memory.cpp b/boards/bitcraze/crazyflie/syslink/syslink_memory.cpp
similarity index 100%
rename from src/modules/syslink/syslink_memory.cpp
rename to boards/bitcraze/crazyflie/syslink/syslink_memory.cpp
diff --git a/src/modules/syslink/syslink_params.c b/boards/bitcraze/crazyflie/syslink/syslink_params.c
similarity index 100%
rename from src/modules/syslink/syslink_params.c
rename to boards/bitcraze/crazyflie/syslink/syslink_params.c