diff --git a/CMakeLists.txt b/CMakeLists.txt
index c673f5f..d34bc34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,17 +121,25 @@ link_libraries(${TARGET_LIBS})
 add_executable("${CMAKE_PROJECT_NAME}_FLASH.elf" ${TARGET_SOURCES})
 target_link_options("${CMAKE_PROJECT_NAME}_FLASH.elf"
     PRIVATE "-T${TARGET_LDSCRIPT_FLASH}"
+    PRIVATE "-Wl,--Map=${CMAKE_PROJECT_NAME}_FLASH.map"
 )
 add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_FLASH.hex"
     COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_FLASH.elf" "${CMAKE_PROJECT_NAME}_FLASH.hex"
     DEPENDS "${CMAKE_PROJECT_NAME}_FLASH.elf"
 )
+set_property(TARGET "${CMAKE_PROJECT_NAME}_FLASH.elf" APPEND
+    PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_PROJECT_NAME}_FLASH.map"
+)
 add_custom_target("${CMAKE_PROJECT_NAME}_FLASH_HEX" DEPENDS "${CMAKE_PROJECT_NAME}_FLASH.hex")
 
 # Create ELF
 add_executable("${CMAKE_PROJECT_NAME}_RAM.elf" ${TARGET_SOURCES})
 target_link_options("${CMAKE_PROJECT_NAME}_RAM.elf"
     PRIVATE "-T${TARGET_LDSCRIPT_RAM}"
+    PRIVATE "-Wl,--Map=${CMAKE_PROJECT_NAME}_RAM.map"
+)
+set_property(TARGET "${CMAKE_PROJECT_NAME}_FLASH.elf" APPEND
+    PROPERTY ADDITIONAL_CLEAN_FILES "${CMAKE_PROJECT_NAME}_RAM.map"
 )
 add_custom_command(OUTPUT "${CMAKE_PROJECT_NAME}_RAM.hex"
     COMMAND ${CMAKE_OBJCOPY} "-O" "ihex" "${CMAKE_PROJECT_NAME}_RAM.elf" "${CMAKE_PROJECT_NAME}_RAM.hex"