diff --git a/src/tag.c b/src/tag.c
index f9738ef..41c7c58 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1854,7 +1854,7 @@
 
 		if (state == TS_BINARY && orgpat.regmatch.rm_ic && !sortic)
 		{
-		    /* binary search won't work for ignoring case, use linear
+		    /* Binary search won't work for ignoring case, use linear
 		     * search. */
 		    linear = TRUE;
 		    state = TS_LINEAR;
@@ -1922,6 +1922,19 @@
 			    MSG(_("Ignoring long line in tags file"));
 			    verbose_leave();
 			}
+#ifdef FEAT_TAG_BINS
+			if (state != TS_LINEAR)
+			{
+			    /* Avoid getting stuck. */
+			    linear = TRUE;
+			    state = TS_LINEAR;
+# ifdef HAVE_FSEEKO
+			    fseeko(fp, search_info.low_offset, SEEK_SET);
+# else
+			    fseek(fp, (long)search_info.low_offset, SEEK_SET);
+# endif
+			}
+#endif
 			continue;
 		    }
 
diff --git a/src/version.c b/src/version.c
index e2f60f6..af276df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    373,
+/**/
     372,
 /**/
     371,