diff --git a/src/version.c b/src/version.c
index 7b6b07fc3..d207e9458 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    396,
 /**/
     395,
 /**/
diff --git a/src/xdiff/xutils.c b/src/xdiff/xutils.c
index 4ab6ca8fd..25a090fb7 100644
--- a/src/xdiff/xutils.c
+++ b/src/xdiff/xutils.c
@@ -51,7 +51,7 @@ int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
 	mb[1].size = size;
 	if (size > 0 && rec[size - 1] != '\n') {
 		mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
-		mb[2].size = strlen(mb[2].ptr);
+		mb[2].size = (long)strlen(mb[2].ptr);
 		i++;
 	}
 	if (ecb->outf(ecb->priv, mb, i) < 0) {