diff --git a/src/indent.c b/src/indent.c
index 3148495db1..95fc74ee46 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1726,7 +1726,7 @@ ex_retab(exarg_T *eap)
 			len = num_spaces + num_tabs;
 			old_len = (long)STRLEN(ptr);
 			new_len = old_len - col + start_col + len + 1;
-			if (new_len >= MAXCOL)
+			if (new_len <= 0 || new_len >= MAXCOL)
 			{
 			    emsg(_(e_resulting_text_too_long));
 			    break;
diff --git a/src/version.c b/src/version.c
index 18f7892f18..ea5119c32d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4364,
 /**/
     4363,
 /**/