diff --git a/src/fileio.c b/src/fileio.c
index d68adec..ce5ee76 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5537,7 +5537,7 @@
     int		len = 2;
 
     if (p[0] == 0xef && p[1] == 0xbb && size >= 3 && p[2] == 0xbf
-	    && (flags == FIO_ALL || flags == 0))
+	    && (flags == FIO_ALL || flags == FIO_UTF8 || flags == 0))
     {
 	name = "utf-8";		/* EF BB BF */
 	len = 3;
diff --git a/src/version.c b/src/version.c
index 99b8565..f6843cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    21,
+/**/
     20,
 /**/
     19,