diff --git a/src/gui.c b/src/gui.c
index ea049c39d5..88b5d7bf9f 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -4166,7 +4166,7 @@ gui_update_scrollbars(
     /* avoid that moving components around generates events */
     ++hold_gui_events;
 
-    FOR_ALL_WINDOWS(wp)
+    for (wp = firstwin; wp != NULL; wp = W_NEXT(wp))
     {
 	if (wp->w_buffer == NULL)	/* just in case */
 	    continue;
diff --git a/src/version.c b/src/version.c
index 0b63a299d1..041228ecaf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2102,
 /**/
     2101,
 /**/