diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98f2b5e8..159779b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,11 @@ set(MISSION_PATH mission)
 include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake)
 pre_source_hw_os_config()
 
+if(${OS_FSFW} MATCHES linux)
+set(FSFW_CONFIG_PATH "fsfwconfig")
+else()
 set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
+endif()
 
 ################################################################################
 # Executable and Sources
@@ -57,9 +61,10 @@ set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
 add_executable(${TARGET_NAME})
 
 # Add subdirectories
-if(LIB_OS_NAME)
-	add_subdirectory(${LIB_OS_NAME})
+if(${OS_FSFW} MATCHES linux)
+	add_subdirectory(${FSFW_CONFIG_PATH})
 endif()
+
 add_subdirectory(${BSP_PATH})
 add_subdirectory(${FSFW_PATH})
 add_subdirectory(${MISSION_PATH})
diff --git a/bsp_linux/boardconfig/CMakeLists.txt b/bsp_linux/boardconfig/CMakeLists.txt
index 2a1cb58a..c32b326d 100644
--- a/bsp_linux/boardconfig/CMakeLists.txt
+++ b/bsp_linux/boardconfig/CMakeLists.txt
@@ -1,3 +1,7 @@
+target_sources(${TARGET_NAME} PRIVATE
+	print.c
+)
+
 target_include_directories(${TARGET_NAME} PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
diff --git a/buildsystem/cmake/HardwareOsPreConfig.cmake b/buildsystem/cmake/HardwareOsPreConfig.cmake
index c2524bd7..39e52168 100644
--- a/buildsystem/cmake/HardwareOsPreConfig.cmake
+++ b/buildsystem/cmake/HardwareOsPreConfig.cmake
@@ -53,7 +53,9 @@ if(CMAKE_CROSSCOMPILING)
 endif()
 	
 if(${TGT_BSP} MATCHES "arm/raspberrypi")
-
+	
+	set(BSP_PATH "bsp_linux")
+	
 else() 
 
 	if(TGT_BSP)
diff --git a/fsfwconfig/CMakeLists.txt b/fsfwconfig/CMakeLists.txt
new file mode 100644
index 00000000..897789ef
--- /dev/null
+++ b/fsfwconfig/CMakeLists.txt
@@ -0,0 +1,11 @@
+target_sources(${TARGET_NAME} PRIVATE
+	ipc/MissionMessageTypes.cpp
+	pollingsequence/PollingSequenceFactory.cpp
+)
+
+target_include_directories(${TARGET_NAME} PUBLIC
+	${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+
+