diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ca6671..a8d94fa2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,16 +162,18 @@ else()
 	set(TARGET_STRING "Target BSP: Hosted")
 endif()
 
+string(CONCAT POST_BUILD_COMMENT
+    "Build directory: ${CMAKE_BINARY_DIR}\n"
+    "Target OSAL: ${OS_FSFW}\n"
+    "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
+    "${TARGET_STRING}"
+)
+
 add_custom_command(
    TARGET ${TARGET_NAME}
    POST_BUILD
-   #COMMAND echo "Build directory: ${CMAKE_BINARY_DIR}"
-   #COMMAND echo "Target OSAL: ${OS_FSFW}"
-   #COMMAND echo "Target Build Type: ${CMAKE_BUILD_TYPE}"
-   #COMMAND echo "${TARGET_STRING}"
    COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX}
-   COMMENT "Build directory: ${CMAKE_BINARY_DIR}\nTarget OSAL: ${OS_FSFW}\n"
-           "Target Build Type: ${CMAKE_BUILD_TYPE}\n${TARGET_STRING}"
+   COMMENT ${POST_BUILD_COMMENT}
 )
 
 include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
diff --git a/fsfw b/fsfw
index 50733e22..5f197be2 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 50733e223adaf9fc95d9728c62a026ea6efac1d2
+Subproject commit 5f197be2ff4b7cfa1940d41a5d02c08ffe1abd3b