diff --git a/configure.in b/configure.in
index 1ba41dc6f..b65e10c6e 100644
--- a/configure.in
+++ b/configure.in
@@ -159,7 +159,8 @@ AC_HEADER_STDC
 
 AC_CHECK_HEADERS(arpa/inet.h arpa/telnet.h bsdsetjmp.h crypt.h)
 AC_CHECK_HEADERS(curses.h db.h dbm.h dirent.h err.h errno.h)
-AC_CHECK_HEADERS(fcntl.h grp.h inttypes.h limits.h ndbm.h net/if.h netdb.h)
+AC_CHECK_HEADERS(fcntl.h fnmatch.h grp.h inttypes.h limits.h ndbm.h)
+AC_CHECK_HEADERS(net/if.h netdb.h)
 AC_CHECK_HEADERS(netinet/in.h netinet/in6.h netinet/in6_var.h)
 AC_CHECK_HEADERS(netinet/in6_machtypes.h netinet/in_systm.h)
 AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinfo/ni.h netinet6/in6.h paths.h pty.h pwd.h)
@@ -177,6 +178,10 @@ if test "$ac_cv_header_err_h" = no; then
 	EXTRA_HDRS="$EXTRA_HDRS err.h"
 	AC_SUBST(EXTRA_HDRS)
 fi
+if test "$ac_cv_header_fnmatch_h" = no; then
+	EXTRA_HDRS="$EXTRA_HDRS fnmatch.h"
+	AC_SUBST(EXTRA_HDRS)
+fi
 
 dnl Checks for libraries.
 
@@ -215,7 +220,7 @@ AC_FIND_IF_NOT_BROKEN(hstrerror, resolv,
 #endif],
 17)
 
-AC_BROKEN(chown daemon err errx fchown flock getcwd)
+AC_BROKEN(chown daemon err errx fchown flock fnmatch getcwd)
 AC_BROKEN(getdtablesize getopt getusershell inet_aton initgroups)
 AC_BROKEN(lstat memmove mkstemp putenv rcmd readv setegid setenv)
 AC_BROKEN(seteuid setenv seteuid strcasecmp strdup strerror strftime)