diff --git a/src/main.c b/src/main.c
index 954384a..4e027ab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -366,14 +366,21 @@
      * Check if the GUI can be started.  Reset gui.starting if not.
      * Don't know about other systems, stay on the safe side and don't check.
      */
-    if (gui.starting && gui_init_check() == FAIL)
+    if (gui.starting)
     {
-	gui.starting = FALSE;
+	if (gui_init_check() == FAIL)
+	{
+	    gui.starting = FALSE;
 
-	/* When running "evim" or "gvim -y" we need the menus, exit if we
-	 * don't have them. */
-	if (params.evim_mode)
-	    mch_exit(1);
+	    /* When running "evim" or "gvim -y" we need the menus, exit if we
+	     * don't have them. */
+	    if (params.evim_mode)
+		mch_exit(1);
+	}
+#  if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+	/* Re-initialize locale, it may have been altered by gui_init_check() */
+	init_locale();
+#  endif
     }
 # endif
 #endif
@@ -3685,7 +3692,7 @@
 	}
 	else if (STRICMP(argv[i], "--servername") == 0)
 	{
-	    /* Alredy processed. Take it out of the command line */
+	    /* Already processed. Take it out of the command line */
 	    i++;
 	    continue;
 	}
diff --git a/src/version.c b/src/version.c
index ff77e91..aeee1c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    318,
+/**/
     317,
 /**/
     316,