diff --git a/src/fileio.c b/src/fileio.c
index a9552b5..46d364a 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4568,7 +4568,7 @@
 	    c = TRUE;
 	    if (write_info.bw_conv_error_lnum != 0)
 	    {
-		int l = STRLEN(IObuff);
+		size_t l = STRLEN(IObuff);
 		vim_snprintf((char *)IObuff + l, IOSIZE - l, _(" in line %ld;"),
 			(long)write_info.bw_conv_error_lnum);
 	    }
diff --git a/src/version.c b/src/version.c
index 9d05ca9..612f715 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    254,
+/**/
     253,
 /**/
     252,