diff --git a/src/eval.c b/src/eval.c
index 2e4cd12f0..45872be35 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -17759,6 +17759,13 @@ set_var(name, tv, copy)
     }
     else		    /* add a new variable */
     {
+	/* Can't add "v:" variable. */
+	if (ht == &vimvarht)
+	{
+	    EMSG2(_(e_illvar), name);
+	    return;
+	}
+
 	/* Make sure the variable name is valid. */
 	for (p = varname; *p != NUL; ++p)
 	    if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p))
diff --git a/src/version.c b/src/version.c
index ad900240f..15e38e243 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    24,
 /**/
     23,
 /**/