diff --git a/src/evalvars.c b/src/evalvars.c
index e83c50d..f7939cb 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2023,7 +2023,7 @@
 {
     hashtab_T	*ht;
     hashitem_T	*hi;
-    char_u	*varname;
+    char_u	*varname = NULL;  // init to shut up gcc
     dict_T	*d;
     dictitem_T	*di;
 
diff --git a/src/version.c b/src/version.c
index 250b73e..980ddff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5017,
+/**/
     5016,
 /**/
     5015,