diff --git a/src/fileio.c b/src/fileio.c
index bf724f6..446ae7e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7470,6 +7470,24 @@
 	for (p = retval; *p; ++p)
 	    if (*p == '\\')
 		*p = '/';
+
+#if defined(FEAT_MBYTE) && defined(WIN3264)
+    if (enc_utf8)
+    {
+	int	len;
+	char_u  *pp = NULL;
+
+	// Convert from active codepage to UTF-8 since mch_call_shell()
+	// converts command-line to wide string from encoding.
+	acp_to_enc(retval, (int)STRLEN(retval), &pp, &len);
+	if (pp != NULL)
+	{
+	    vim_free(retval);
+	    return pp;
+	}
+    }
+#endif
+
     return retval;
 
 # else /* WIN3264 */
diff --git a/src/version.c b/src/version.c
index 6a8ba37..f1205f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    879,
+/**/
     878,
 /**/
     877,