diff --git a/doc/config.nh b/doc/config.nh
index ce5410382..437158250 100644
--- a/doc/config.nh
+++ b/doc/config.nh
@@ -347,7 +347,8 @@
 # How the map window is shown?  Windows GUI only.
 # possible map_mode options include: tiles, ascii4x6,
 # ascii6x8, ascii8x8, ascii16x8, ascii7x12, ascii8x12, ascii16x12,
-# ascii12x16, ascii10x18, fit_to_screen
+# ascii12x16, ascii10x18, fit_to_screen, ascii_fit_to_screen,
+# tiles_fit_to_screen
 #OPTIONS=map_mode:tiles
 
 # Define alternative file for the files, and the tile size
diff --git a/src/options.c b/src/options.c
index 28de184c3..bfeb08604 100644
--- a/src/options.c
+++ b/src/options.c
@@ -3396,7 +3396,8 @@ boolean tinitial, tfrom_file;
     /* WINCAP
      *
      *  map_mode:[tiles|ascii4x6|ascii6x8|ascii8x8|ascii16x8|ascii7x12
-     *            |ascii8x12|ascii16x12|ascii12x16|ascii10x18|fit_to_screen]
+     *            |ascii8x12|ascii16x12|ascii12x16|ascii10x18|fit_to_screen
+     *            |ascii_fit_to_screen|tiles_fit_to_screen]
      */
     fullname = "map_mode";
     if (match_optname(opts, fullname, sizeof "map_mode" - 1, TRUE)) {
@@ -3404,7 +3405,7 @@ boolean tinitial, tfrom_file;
             complain_about_duplicate(opts, 1);
         op = string_for_opt(opts, negated);
         if (op && !negated) {
-            if (!strncmpi(op, "tiles", sizeof "tiles" - 1))
+            if (!strcmpi(op, "tiles"))
                 iflags.wc_map_mode = MAP_MODE_TILES;
             else if (!strncmpi(op, "ascii4x6", sizeof "ascii4x6" - 1))
                 iflags.wc_map_mode = MAP_MODE_ASCII4x6;
@@ -3427,6 +3428,12 @@ boolean tinitial, tfrom_file;
             else if (!strncmpi(op, "fit_to_screen",
                                sizeof "fit_to_screen" - 1))
                 iflags.wc_map_mode = MAP_MODE_ASCII_FIT_TO_SCREEN;
+            else if (!strncmpi(op, "ascii_fit_to_screen",
+                               sizeof "ascii_fit_to_screen" - 1))
+                iflags.wc_map_mode = MAP_MODE_ASCII_FIT_TO_SCREEN;
+            else if (!strncmpi(op, "tiles_fit_to_screen",
+                               sizeof "tiles_fit_to_screen" - 1))
+                iflags.wc_map_mode = MAP_MODE_TILES_FIT_TO_SCREEN;
             else {
                 config_error_add("Unknown %s parameter '%s'", fullname, op);
                 return FALSE;
diff --git a/sys/winnt/.nethackrc.template b/sys/winnt/.nethackrc.template
index 39b7924cf..50605b27d 100644
--- a/sys/winnt/.nethackrc.template
+++ b/sys/winnt/.nethackrc.template
@@ -104,7 +104,8 @@ OPTIONS=suppress_alert:3.3.1
 # Map window settings
 # possible map_mode options include: tiles|ascii4x6|ascii6x8|ascii8x8|ascii16x8|
 #                                    ascii7x12|ascii8x12|ascii16x12|ascii12x16|
-#                                    ascii10x18|fit_to_screen
+#                                    ascii10x18|fit_to_screen|ascii_fit_to_screen|
+#                                    tiles_fit_to_screen
 OPTIONS=map_mode:tiles,scroll_margin:10
 
 # Message window settings