diff --git a/src/diff.c b/src/diff.c
index 69ba7a3..02f1c33 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -712,7 +712,7 @@
 
     // xdiff requires one big block of memory with all the text.
     for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
-	len += STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
+	len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
     ptr = lalloc(len, TRUE);
     if (ptr == NULL)
     {
diff --git a/src/version.c b/src/version.c
index 29557cd..7b6b07f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    395,
+/**/
     394,
 /**/
     393,