diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index cc80c14..7be802c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5845,8 +5845,14 @@
 	}
 	else
 	{
+#ifdef FEAT_MBYTE
+	    int charlen = (*mb_ptr2len)(p);
+	    len += charlen;
+	    p += charlen;
+#else
 	    ++len;
 	    ++p;
+#endif
 	}
     }
 
@@ -5889,7 +5895,7 @@
 	}
 	else
 	{
-	    *q++ = *p++;
+	    MB_COPY_CHAR(p, q);
 	}
     }
     *q++ = '"';
diff --git a/src/version.c b/src/version.c
index 9c03d60..209fa49 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    600,
+/**/
     599,
 /**/
     598,