diff --git a/src/main.c b/src/main.c
index 438cb997ef..fdfc2b82f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1360,8 +1360,7 @@ init_locale()
 	p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
 	if (p != NULL && *p != NUL)
 	{
-	    STRCPY(NameBuff, p);
-	    STRCAT(NameBuff, "/lang");
+	    vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
 	    bindtextdomain(VIMPACKAGE, (char *)NameBuff);
 	}
 	if (mustfree)
diff --git a/src/version.c b/src/version.c
index bebd3e9e6a..831db0f1c9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    11,
 /**/
     10,
 /**/