diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 0be3a69..0388de8 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9455,6 +9455,12 @@
     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 5794e3a..6224e3d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2000,
+/**/
     1999,
 /**/
     1998,