diff --git a/src/screen.c b/src/screen.c
index 451c0ee114..abe721ed26 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -5743,6 +5743,13 @@ win_redr_status(wp)
     int		fillchar;
     int		attr;
     int		this_ru_col;
+    static int  busy = FALSE;
+
+    /* It's possible to get here recursively when 'statusline' (indirectly)
+     * invokes ":redrawstatus".  Simply ignore the call then. */
+    if (busy)
+	return;
+    busy = TRUE;
 
     wp->w_redr_status = FALSE;
     if (wp->w_status_height == 0)
@@ -5881,6 +5888,7 @@ win_redr_status(wp)
 									attr);
     }
 #endif
+    busy = FALSE;
 }
 
 #ifdef FEAT_STL_OPT
diff --git a/src/version.c b/src/version.c
index f9ebbeaa45..2ec6a6a9df 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    207,
 /**/
     206,
 /**/