diff --git a/src/version.c b/src/version.c
index 1fc1767..18f7892 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4363,
+/**/
     4362,
 /**/
     4361,
diff --git a/src/vim.h b/src/vim.h
index 3fea0d9..09303e9 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1739,7 +1739,9 @@
 # define MAXCOL (0x3fffffffL)		// maximum column number, 30 bits
 # define MAXLNUM (0x3fffffffL)		// maximum (invalid) line number
 #else
-# define MAXCOL  INT_MAX		// maximum column number
+  // MAXCOL used to be INT_MAX, but with 64 bit ints that results in running
+  // out of memory when trying to allocate a very long line.
+# define MAXCOL  0x7fffffffL		// maximum column number
 # define MAXLNUM LONG_MAX		// maximum (invalid) line number
 #endif