diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 71a7b1bb9c..701354ee07 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9300,7 +9300,7 @@ ex_tag_cmd(eap, name)
 		  break;
 	default:			/* ":tag" */
 #ifdef FEAT_CSCOPE
-		  if (p_cst)
+		  if (p_cst && *eap->arg != NUL)
 		  {
 		      do_cstag(eap);
 		      return;
diff --git a/src/version.c b/src/version.c
index aa283c4fc0..fbde4b4692 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 */
+/**/
+    316,
 /**/
     315,
 /**/