diff --git a/src/ops.c b/src/ops.c
index 0c3d11b87f..f0d372d898 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -5663,8 +5663,8 @@ read_viminfo_register(virp, force)
     int		set_prev = FALSE;
     char_u	*str;
     char_u	**array = NULL;
-    int		new_type;
-    colnr_T	new_width;
+    int		new_type = MCHAR; /* init to shut up compiler */
+    colnr_T	new_width = 0; /* init to shut up compiler */
 
     /* We only get here (hopefully) if line[0] == '"' */
     str = virp->vir_line + 1;
@@ -5747,6 +5747,7 @@ read_viminfo_register(virp, force)
 		do_it = FALSE;
 	}
     }
+
     if (do_it)
     {
 	/* free y_array[] */
diff --git a/src/version.c b/src/version.c
index cdde7ca528..4e8559ccc1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    581,
 /**/
     580,
 /**/