diff --git a/src/message_test.c b/src/message_test.c
index 014d8d9..85a29b4 100644
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -127,7 +127,7 @@
     int		n;
     size_t	bsize;
     int		bsize_int;
-    char	*ptr = (char *)0x87654321;
+    void	*ptr = (void *)0x87654321;
 
     // Loop on various buffer sizes to make sure that truncation of
     // vim_snprintf() is correct.
diff --git a/src/version.c b/src/version.c
index f175ff3..2b1a126 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    608,
+/**/
     607,
 /**/
     606,