diff --git a/compiler/systems/t_msdos.pas b/compiler/systems/t_msdos.pas
index b1d68dd456..ab77e206a8 100644
--- a/compiler/systems/t_msdos.pas
+++ b/compiler/systems/t_msdos.pas
@@ -276,6 +276,8 @@ begin
   else
     LinkRes.Add('format dos');
   LinkRes.Add('option dosseg');
+  if (cs_link_map in current_settings.globalswitches) then
+    LinkRes.Add('option map='+maybequoted(ChangeFileExt(current_module.exefilename,'.map')));
   LinkRes.Add('name ' + maybequoted(current_module.exefilename));
 
   { Write and Close response }