diff --git a/src/option.c b/src/option.c
index 491a8d8..99e94d5 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5867,6 +5867,10 @@
 #endif
 	    /* update flag in swap file */
 	    ml_setflags(curbuf);
+	    /* Redraw needed when switching to/from "mac": a CR in the text
+	     * will be displayed differently. */
+	    if (get_fileformat(curbuf) == EOL_MAC || *oldval == 'm')
+		redraw_curbuf_later(NOT_VALID);
 	}
     }
 
diff --git a/src/version.c b/src/version.c
index b7aacc1..b83d0b6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    357,
+/**/
     356,
 /**/
     355,