diff --git a/src/drawscreen.c b/src/drawscreen.c
index 36034cc9d..a08cea3d6 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -479,7 +479,10 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
 		    || bufIsChanged(wp->w_buffer)
 		    || wp->w_buffer->b_p_ro)
 		&& plen < MAXPATHL - 1)
-	    *(p + plen++) = ' ';
+	{
+	    *(p + plen++) = ' ';	// replace NUL with space
+	    *(p + plen) = NUL;		// NUL terminate the string
+	}
 	if (bt_help(wp->w_buffer))
 	    plen += vim_snprintf((char *)p + plen, MAXPATHL - plen, "%s", _("[Help]"));
 #ifdef FEAT_QUICKFIX
diff --git a/src/version.c b/src/version.c
index 5a47806a5..c360a2416 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 */
+/**/
+    1021,
 /**/
     1020,
 /**/