diff --git a/src/mbyte.c b/src/mbyte.c
index f3fdc32..697e585 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4453,8 +4453,13 @@
 
     if (STRCMP(enc, "default") == 0)
     {
+#ifdef MSWIN
+	// Use the system encoding, the default is always utf-8.
+	r = enc_locale();
+#else
 	// Use the default encoding as it's found by set_init_1().
 	r = get_encoding_default();
+#endif
 	if (r == NULL)
 	    r = (char_u *)ENC_DFLT;
 	return vim_strsave(r);
diff --git a/src/version.c b/src/version.c
index 56ce534..8584778 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2915,
+/**/
     2914,
 /**/
     2913,