diff --git a/src/fileio.c b/src/fileio.c
index cb839b8..9ce41d4 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6627,7 +6627,10 @@
 			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
 			mesg2 = _("See \":help W16\" for more info.");
 		    }
-		    /* Else: only timestamp changed, ignored */
+		    else
+			/* Only timestamp changed, store it to avoid a warning
+			 * in check_mtime() later. */
+			buf->b_mtime_read = buf->b_mtime;
 		}
 	    }
 	}
diff --git a/src/version.c b/src/version.c
index 22d18de..145ef2e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    210,
+/**/
     209,
 /**/
     208,