diff --git a/src/main.c b/src/main.c
index 82e89a8cb..76252c7d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1979,7 +1979,9 @@ command_line_scan(mparm_T *parmp)
 		{
 		    Columns = 80;	// need to init Columns
 		    info_message = TRUE; // use mch_msg(), not mch_errmsg()
+#if defined(FEAT_GUI) && !defined(ALWAYS_USE_GUI)
 		    gui.starting = FALSE; // not starting GUI, will exit
+#endif
 		    list_version();
 		    msg_putchar('\n');
 		    msg_didout = FALSE;
diff --git a/src/version.c b/src/version.c
index 2f4a03eee..8918ec5fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2500,
 /**/
     2499,
 /**/