diff --git a/xtldr2/CMakeLists.txt b/xtldr2/CMakeLists.txt
index 2527989..08e0901 100644
--- a/xtldr2/CMakeLists.txt
+++ b/xtldr2/CMakeLists.txt
@@ -43,6 +43,7 @@ set_target_properties(xtldr PROPERTIES OUTPUT_NAME ${BINARY_NAME} SUFFIX .efi)
 set_install_target(xtldr efi/boot)
 
 # Set loader entrypoint and subsystem
-set_imagebase(xtldr ${BASEADDRESS_XTLDR})
 set_entrypoint(xtldr "BlStartXtLoader")
+set_imagebase(xtldr ${BASEADDRESS_XTLDR})
+set_linker_map(xtldr TRUE)
 set_subsystem(xtldr efi_application)
diff --git a/xtldr2/modules/dummy/CMakeLists.txt b/xtldr2/modules/dummy/CMakeLists.txt
index 86b2145..46bd990 100644
--- a/xtldr2/modules/dummy/CMakeLists.txt
+++ b/xtldr2/modules/dummy/CMakeLists.txt
@@ -23,4 +23,5 @@ set_install_target(dummy efi/boot/xtldr/modules)
 
 # Set module entrypoint and subsystem
 set_entrypoint(dummy "XtLdrModuleMain")
+set_linker_map(dummy TRUE)
 set_subsystem(dummy efi_boot_service_driver)