diff --git a/src/os_mswin.c b/src/os_mswin.c
index 8154549..ef75642 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -2965,7 +2965,9 @@
 	int	did_replace = FALSE;
 
 	for (i = 0; lf->lfFaceName[i]; ++i)
-	    if (lf->lfFaceName[i] == '_')
+	    if (IsDBCSLeadByte(lf->lfFaceName[i]))
+		++i;
+	    else if (lf->lfFaceName[i] == '_')
 	    {
 		lf->lfFaceName[i] = ' ';
 		did_replace = TRUE;
diff --git a/src/version.c b/src/version.c
index a941d85..4051588 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    907,
+/**/
     906,
 /**/
     905,