diff --git a/src/spell.c b/src/spell.c
index 98f5e3478b..47b86ade83 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -9780,10 +9780,16 @@ init_spell_chartab()
     {
 	for (i = 128; i < 256; ++i)
 	{
+	    int f = utf_fold(i);
+	    int u = utf_toupper(i);
+
 	    spelltab.st_isu[i] = utf_isupper(i);
 	    spelltab.st_isw[i] = spelltab.st_isu[i] || utf_islower(i);
-	    spelltab.st_fold[i] = utf_fold(i);
-	    spelltab.st_upper[i] = utf_toupper(i);
+	    /* The folded/upper-cased value is different between latin1 and
+	     * utf8 for 0xb5, causing E763 for no good reason.  Use the latin1
+	     * value for utf-8 to avoid this. */
+	    spelltab.st_fold[i] = (f < 256) ? f : i;
+	    spelltab.st_upper[i] = (u < 256) ? u : i;
 	}
     }
     else
diff --git a/src/version.c b/src/version.c
index 1f57dd7f60..d46f0eb10f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    422,
 /**/
     421,
 /**/