diff --git a/src/option.c b/src/option.c
index 2b9ba2dcf..35563c3d5 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5880,7 +5880,7 @@ did_set_string_option(
      * separator (slash and/or backslash), wildcards and characters that are
      * often illegal in a file name. */
     else if ((options[opt_idx].flags & P_NFNAME)
-			 && vim_strpbrk(*varp, (char_u *)"/\\*?[|<>") != NULL)
+		    && vim_strpbrk(*varp, (char_u *)"/\\*?[|;&<>\r\n") != NULL)
     {
 	errmsg = e_invarg;
     }
diff --git a/src/version.c b/src/version.c
index 4064441c1..5f13f7689 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    100,
 /**/
     99,
 /**/