diff --git a/src/ops.c b/src/ops.c
index 72ffd56bc9..28e97577f3 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3813,8 +3813,12 @@ cursor_pos_info(dict_T *dict)
 
 	bom_count = bomb_size();
 	if (dict == NULL && bom_count > 0)
-	    vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE,
+	{
+	    size_t len = STRLEN(IObuff);
+
+	    vim_snprintf((char *)IObuff + len, IOSIZE - len,
 				 _("(+%lld for BOM)"), (long_long_T)bom_count);
+	}
 	if (dict == NULL)
 	{
 	    // Don't shorten this message, the user asked for it.
diff --git a/src/version.c b/src/version.c
index d40cb3b4d1..79f9f7c9c6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    63,
 /**/
     62,
 /**/