diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index e7b3b2865b..72603d1bd2 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2834,13 +2834,23 @@ write_viminfo_barlines(vir_T *virp, FILE *fp_out)
 {
     int		i;
     garray_T	*gap = &virp->vir_barlines;
+    int		seen_useful = FALSE;
+    char	*line;
 
     if (gap->ga_len > 0)
     {
 	fputs(_("\n# Bar lines, copied verbatim:\n"), fp_out);
 
+	/* Skip over continuation lines until seeing a useful line. */
 	for (i = 0; i < gap->ga_len; ++i)
-	    fputs(((char **)(gap->ga_data))[i], fp_out);
+	{
+	    line = ((char **)(gap->ga_data))[i];
+	    if (seen_useful || line[1] != '<')
+	    {
+		fputs(line, fp_out);
+		seen_useful = TRUE;
+	    }
+	}
     }
 }
 #endif /* FEAT_VIMINFO */
diff --git a/src/version.c b/src/version.c
index 8a7c8d7740..0a720cd1ef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1987,
 /**/
     1986,
 /**/