diff --git a/src/Make_all.mak b/src/Make_all.mak
index 4aa30b8..949d0a3 100644
--- a/src/Make_all.mak
+++ b/src/Make_all.mak
@@ -1,5 +1,5 @@
 #
-# Common Makefile, defines the list of tests to run.
+# Common Makefile, defines the list of tests to run and other things.
 #
 
 # Individual tests, including the ones part of test_alot.
@@ -210,3 +210,15 @@
 	test_alot_latin \
 	test_alot_utf8 \
 	test_alot
+
+# Argument for running ctags.
+TAGS_FILES = \
+	*.c \
+	*.cpp \
+	*.h \
+	auto/*.c \
+	libvterm/src/*.c \
+	libvterm/src/*.h \
+	libvterm/include/*.h \
+	xdiff/*.c \
+	xdiff/*.h
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 79bff50..52156dd 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -983,11 +983,7 @@
 	$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)' STATIC_STDCPLUS=$(STATIC_STDCPLUS)
 
 tags: notags
-	$(CTAGS) *.c *.cpp *.h
-ifdef PERL
-	$(CTAGS) --append=yes auto$(DIRSLASH)if_perl.c
-endif
-
+	$(CTAGS) $(TAGS_FILES)
 
 notags:
 	-$(DEL) tags
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index a35708d..5e22470 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1270,8 +1270,7 @@
 
 
 tags: notags
-	$(CTAGS) *.c *.cpp *.h
-	if exist auto\if_perl.c $(CTAGS) --append=yes auto\if_perl.c
+	$(CTAGS) $(TAGS_FILES)
 
 notags:
 	- if exist tags del tags
diff --git a/src/Makefile b/src/Makefile
index ecceaf5..2d966d1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1573,8 +1573,6 @@
 #	   ALL_GUI_SRC: all GUI files for Unix
 #
 #		   SRC: files used for current configuration
-#	      TAGS_SRC: source files used for make tags
-#	     TAGS_INCL: include files used for make tags
 #	       ALL_SRC: source files used for make depend and make lint
 
 BASIC_SRC = \
@@ -1656,9 +1654,6 @@
 	$(WORKSHOP_SRC) \
 	$(WSDEBUG_SRC)
 
-TAGS_SRC = *.c *.cpp $(PERL_SRC) $(TERM_SRC) $(XDIFF_SRC)
-TAGS_INCL = *.h $(TERM_DEPS) $(XDIFF_INCL)
-
 EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
 	    if_python.c if_python3.c if_tcl.c if_ruby.c \
 	    gui_beval.c workshop.c wsdebug.c integration.c \
@@ -2094,12 +2089,12 @@
 #	Motif and Athena GUI
 # You can ignore error messages for missing files.
 tags TAGS: notags
-	$(TAGPRG) $(TAGS_SRC) $(TAGS_INCL)
+	$(TAGPRG) $(TAGS_FILES)
 
 # Make a highlight file for types.  Requires Exuberant ctags and awk
 types: types.vim
-types.vim: $(TAGS_SRC) $(TAGS_INCL)
-	ctags --c-kinds=gstu -o- $(TAGS_SRC) $(TAGS_INCL) |\
+types.vim: $(TAGS_FILES)
+	ctags --c-kinds=gstu -o- $(TAGS_FILES) |\
 		awk 'BEGIN{printf("syntax keyword Type\t")}\
 			{printf("%s ", $$1)}END{print ""}' > $@
 	echo "syn keyword Constant OK FAIL TRUE FALSE MAYBE" >> $@
diff --git a/src/version.c b/src/version.c
index f44167a..3c194ae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    610,
+/**/
     609,
 /**/
     608,