diff --git a/src/evalfunc.c b/src/evalfunc.c
index c09242101..a5e4b208c 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -7534,7 +7534,7 @@ f_hostname(typval_T *argvars UNUSED, typval_T *rettv)
  * Currently only valid for object/container types.
  * Return empty string if not an object.
  */
-    void
+    static void
 f_id(typval_T *argvars, typval_T *rettv)
 {
     char    numbuf[NUMBUFLEN];
diff --git a/src/version.c b/src/version.c
index 6633b7bea..c0fdd466b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    584,
 /**/
     583,
 /**/