diff --git a/src/feature.h b/src/feature.h
index 46508f74bb..92c4b1374b 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -444,6 +444,10 @@
 # else
 // #  define FEAT_XFONTSET
 # endif
+#else
+# if defined(USE_GTK4)
+#  undef FEAT_XFONTSET
+# endif
 #endif
 
 /*
diff --git a/src/version.c b/src/version.c
index 44bc20abdc..02fc6a82f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    582,
 /**/
     581,
 /**/