diff --git a/cmake/libdwarfs.cmake b/cmake/libdwarfs.cmake
index 56b9a4de..9e6317b0 100644
--- a/cmake/libdwarfs.cmake
+++ b/cmake/libdwarfs.cmake
@@ -202,7 +202,7 @@ target_include_directories(dwarfs_common PUBLIC
 
 target_compile_definitions(
   dwarfs_common PRIVATE
-  DWARFS_SYSTEM_ID="${CMAKE_SYSTEM} [${CMAKE_SYSTEM_PROCESSOR}]"
+  DWARFS_SYSTEM_ID="${CMAKE_SYSTEM_NAME} [${CMAKE_SYSTEM_PROCESSOR}]"
   DWARFS_COMPILER_ID="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
 )
 
diff --git a/cmake/libdwarfs_tool.cmake b/cmake/libdwarfs_tool.cmake
index 99ba7eec..d8b9615d 100644
--- a/cmake/libdwarfs_tool.cmake
+++ b/cmake/libdwarfs_tool.cmake
@@ -59,7 +59,7 @@ if(USE_MIMALLOC AND mimalloc_FOUND)
 endif()
 
 target_compile_definitions(
-  dwarfs_tool PRIVATE DWARFS_BUILD_ID="${CMAKE_SYSTEM_PROCESSOR}, ${CMAKE_SYSTEM}, ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
+  dwarfs_tool PRIVATE DWARFS_BUILD_ID="${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_SYSTEM_NAME} using ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}"
 )
 
 list(APPEND LIBDWARFS_OBJECT_TARGETS