diff --git a/src/buffer.c b/src/buffer.c
index d1907a44fc..fd94a27449 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2793,6 +2793,8 @@ buflist_list(eap)
 		(buf->b_flags & BF_READERR) ? 'x'
 					    : (bufIsChanged(buf) ? '+' : ' '),
 		NameBuff);
+	if (len > IOSIZE - 20)
+	    len = IOSIZE - 20;
 
 	/* put "line 999" in column 40 or after the file name */
 	i = 40 - vim_strsize(IObuff);
diff --git a/src/version.c b/src/version.c
index 07d2c26319..b753f174ed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1086,
 /**/
     1085,
 /**/