diff --git a/src/index/fsindexer.cpp b/src/index/fsindexer.cpp
index 7052fbdb..8234dd7d 100644
--- a/src/index/fsindexer.cpp
+++ b/src/index/fsindexer.cpp
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <cstring>
-#include <fnmatch.h>
 
 #include <iostream>
 #include <list>
diff --git a/src/rcldb/searchdata.cpp b/src/rcldb/searchdata.cpp
index d041e3fe..fb44f04e 100644
--- a/src/rcldb/searchdata.cpp
+++ b/src/rcldb/searchdata.cpp
@@ -20,7 +20,6 @@
 #include "autoconfig.h"
 
 #include <stdio.h>
-#include <fnmatch.h>
 
 #include <string>
 #include <vector>
diff --git a/src/rcldb/synfamily.cpp b/src/rcldb/synfamily.cpp
index f4e33421..8d0192ff 100644
--- a/src/rcldb/synfamily.cpp
+++ b/src/rcldb/synfamily.cpp
@@ -18,8 +18,6 @@
 
 #include "autoconfig.h"
 
-#include <fnmatch.h>
-
 #include <iostream>
 #include <algorithm>
 
diff --git a/src/utils/conftree.cpp b/src/utils/conftree.cpp
index 70db1ed6..13e91aac 100644
--- a/src/utils/conftree.cpp
+++ b/src/utils/conftree.cpp
@@ -540,7 +540,7 @@ vector<string> ConfSimple::getNames(const string &sk, const char *pattern) const
     mylist.reserve(ss->second.size());
     map<string, string>::const_iterator it;
     for (it = ss->second.begin(); it != ss->second.end(); it++) {
-        if (pattern && FNM_NOMATCH == fnmatch(pattern, it->first.c_str(), 0))
+        if (pattern && 0 != fnmatch(pattern, it->first.c_str(), 0))
             continue;
 	mylist.push_back(it->first);
     }
diff --git a/website/BUGS.html b/website/BUGS.html
index 5a3da18d..88ced3a5 100644
--- a/website/BUGS.html
+++ b/website/BUGS.html
@@ -74,6 +74,12 @@ video/x-msvideo = exec rclnull
 </pre>
         </li>
 
+        <li>Wildcards expressions sometimes cause false matches
+          because of issues in handling errors from fnmatch(). This
+          will only occur in an UTF-8 locale where file name
+          conversion errors are possible (for old 8bit file
+          names).</li>
+
         <li>On systems such as Debian Stable which use Evince version
           2.x (not 3.x) as PDF viewer, the default "Open" command for
           PDF files will not work. You need to edit the command: