diff --git a/src/tag.c b/src/tag.c
index a80a362df3..61d40e5028 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1752,8 +1752,9 @@ line_read_in:
 	    /*
 	     * Emacs tags line with CTRL-L: New file name on next line.
 	     * The file name is followed by a ','.
+	     * Remember etag file name in ebuf.
 	     */
-	    if (*lbuf == Ctrl_L)	/* remember etag file name in ebuf */
+	    if (*lbuf == Ctrl_L && !use_cscope)
 	    {
 		is_etag = 1;		/* in case at the start */
 		state = TS_LINEAR;
diff --git a/src/version.c b/src/version.c
index 918bee46ad..0e13125c79 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    215,
 /**/
     214,
 /**/