diff --git a/src/terminal.c b/src/terminal.c
index 42897bf076..5a0165814f 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1561,7 +1561,8 @@ update_snapshot(term_T *term)
 
 			cell2cellattr(&cell, &p[pos.col]);
 
-			if (ga_grow(&ga, MB_MAXBYTES) == OK)
+			// Each character can be up to 6 bytes.
+			if (ga_grow(&ga, VTERM_MAX_CHARS_PER_CELL * 6) == OK)
 			{
 			    int	    i;
 			    int	    c;
diff --git a/src/version.c b/src/version.c
index 3c194aefe8..99513d1dcc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    611,
 /**/
     610,
 /**/