diff --git a/cmake/BBBCrossCompileConfig.cmake b/cmake/BBBCrossCompileConfig.cmake
index 39ec863..5e0451e 100644
--- a/cmake/BBBCrossCompileConfig.cmake
+++ b/cmake/BBBCrossCompileConfig.cmake
@@ -16,7 +16,7 @@ if(NOT DEFINED ENV{LINUX_ROOTFS})
     endif()
 else()
     set(SYSROOT_PATH "$ENV{LINUX_ROOTFS}" CACHE PATH "Local linux root filesystem path")
-    message(STATUS "Raspberry Pi sysroot: ${SYSROOT_PATH}")
+    message(STATUS "BBB sysroot: ${SYSROOT_PATH}")
 endif()
 
 if(NOT DEFINED ENV{CROSS_COMPILE})
@@ -72,9 +72,9 @@ if(FSFW_BBB_TOOLCHAIN_FILE_MAGIC)
 	# List of library dirs where LD has to look. Pass them directly through gcc.
 	# LD_LIBRARY_PATH is not evaluated by arm-*-ld
 	set(LIB_DIRS
-		"${SYSROOT_PATH}/lib/${MUTLIARCH_FOLDER_NAME}"
+		"${SYSROOT_PATH}/lib/${MULTIARCH_FOLDER_NAME}"
 		"${SYSROOT_PATH}/usr/local/lib"
-		"${SYSROOT_PATH}/usr/lib/${MUTLIARCH_FOLDER_NAME}"
+		"${SYSROOT_PATH}/usr/lib/${MULTIARCH_FOLDER_NAME}"
 		"${SYSROOT_PATH}/usr/lib"
 	)
 	# You can additionally check the linker paths if you add the
diff --git a/doc/README-bbb.md b/doc/README-bbb.md
index 69eb785..34f05cc 100644
--- a/doc/README-bbb.md
+++ b/doc/README-bbb.md
@@ -133,8 +133,10 @@ These prerequisites are valid for Linux as well as Windows hosts.
    ```sh
    rm libpthread.so
    rm librt.so
+   rm libm.so
    ln -s ../../../lib/arm-linux-gnueabihf/libpthread.so.0 libpthread.so
    ln -s ../../../lib/arm-linux-gnueabihf/librt.so.1 librt.so
+   ln -s ../../../lib/arm-linux-gnueabihf/libm.so.6 libm.so
    ```
 
    For more information on issues which can occur when cloning the root filesystem,