diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 443a27a618..57aec4e3c6 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -323,7 +323,8 @@ all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
 vimtags: $(DOCS)
-	$(VIMEXE) -eX -u doctags.vim
+	@if test -x $(VIMEXE); then $(VIMEXE) -eX -u doctags.vim; \
+		else echo "vim executable $(VIMEXE) not found"; fi
 
 # Use "doctags" to generate the tags file.  Only works for English!
 tags: doctags $(DOCS)
diff --git a/src/version.c b/src/version.c
index e1d5c64601..d0f62e9ced 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2239,
 /**/
     2238,
 /**/