diff --git a/src/gui.c b/src/gui.c
index b216121cfe..ed80844f45 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -102,6 +102,10 @@ gui_start()
     else
 #endif
     {
+	/* If there is 'f' in 'guioptions' and specify -g argument,
+	 * gui_mch_init_check() was not called yet.  */
+	if (gui_mch_init_check() != OK)
+	    exit(1);
 	gui_attempt_start();
     }
 
diff --git a/src/version.c b/src/version.c
index fa1313acde..516737923a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    530,
 /**/
     529,
 /**/