diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 0be3a69102..0388de8da4 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9455,6 +9455,12 @@ ex_redir(exarg_T *eap)
     char_u	*fname;
     char_u	*arg = eap->arg;
 
+    if (redir_evalcmd)
+    {
+	EMSG(_("E930: Cannot use :redir inside evalcmd()"));
+	return;
+    }
+
     if (STRICMP(eap->arg, "END") == 0)
 	close_redir();
     else
diff --git a/src/version.c b/src/version.c
index 5794e3a2fe..6224e3dce7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2000,
 /**/
     1999,
 /**/