diff --git a/src/mbyte.c b/src/mbyte.c
index 846ce98f71..735bf6544b 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2294,8 +2294,14 @@ mb_strnicmp(s1, s2, nn)
 	    }
 	    /* Check directly first, it's faster. */
 	    for (j = 0; j < l; ++j)
+	    {
 		if (s1[i + j] != s2[i + j])
 		    break;
+		if (s1[i + j] == 0)
+		    /* Both stings have the same bytes but are incomplete or
+		     * have illegal bytes, accept them as equal. */
+		    l = j;
+	    }
 	    if (j < l)
 	    {
 		/* If one of the two characters is incomplete return -1. */
diff --git a/src/version.c b/src/version.c
index e20349dc97..09cbf736bb 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 */
+/**/
+    178,
 /**/
     177,
 /**/