diff --git a/src/userfunc.c b/src/userfunc.c
index 701edaf30d..bdf4064263 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -403,7 +403,9 @@ register_closure(ufunc_T *fp)
     static void
 set_ufunc_name(ufunc_T *fp, char_u *name)
 {
-    STRCPY(fp->uf_name, name);
+    // Add a type cast to avoid a warning for an overflow, the uf_name[] array
+    // actually extends beyond the struct.
+    STRCPY((void *)fp->uf_name, name);
 
     if (name[0] == K_SPECIAL)
     {
diff --git a/src/version.c b/src/version.c
index 19a2f8296a..804899f064 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2456,
 /**/
     2455,
 /**/