diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 22b41f4..4a860ca 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -4261,6 +4261,9 @@
 		if (what == LC_ALL)
 		{
 		    vim_setenv((char_u *)"LANG", name);
+
+		    /* Clear $LANGUAGE because GNU gettext uses it. */
+		    vim_setenv((char_u *)"LANGUAGE", (char_u *)"");
 # ifdef WIN32
 		    /* Apparently MS-Windows printf() may cause a crash when
 		     * we give it 8-bit text while it's expecting text in the
diff --git a/src/version.c b/src/version.c
index fe0ce58..4980ae5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1257,
+/**/
     1256,
 /**/
     1255,