diff --git a/tools/compat/config.h.in b/tools/compat/config.h.in
index fcd289994a4f..135b95829096 100644
--- a/tools/compat/config.h.in
+++ b/tools/compat/config.h.in
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.h.in,v 1.22 2002/09/16 04:10:36 briggs Exp $	*/
+/*	$NetBSD: config.h.in,v 1.23 2002/10/04 22:10:10 thorpej Exp $	*/
 
 #ifndef	__NETBSD_COMPAT_CONFIG_H__
 #define	__NETBSD_COMPAT_CONFIG_H__
@@ -17,6 +17,7 @@
 #undef HAVE_NETDB_H
 #undef HAVE_MACHINE_BSWAP_H
 #undef HAVE_MALLOC_H
+#undef HAVE_POLL_H
 #undef HAVE_STDDEF_H
 #undef HAVE_STRING_H
 #undef HAVE_SYS_DIR_H
@@ -63,6 +64,7 @@
 #undef HAVE_LUTIMES
 #undef HAVE_MKSTEMP
 #undef HAVE_MKDTEMP
+#undef HAVE_POLL
 #undef HAVE_PREAD
 #undef HAVE_PWCACHE_USERDB
 #undef HAVE_PWRITE
diff --git a/tools/compat/configure b/tools/compat/configure
index a2fdb72ef71d..2765721169ef 100755
--- a/tools/compat/configure
+++ b/tools/compat/configure
@@ -2293,7 +2293,7 @@ fi
 for ac_header in sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
 	sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h \
 	assert.h ctype.h errno.h fcntl.h grp.h limits.h locale.h \
-	netdb.h pwd.h signal.h stdarg.h stdio.h stdlib.h string.h \
+	netdb.h poll.h pwd.h signal.h stdarg.h stdio.h stdlib.h string.h \
 	termios.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -4584,7 +4584,7 @@ fi
 for ac_func in asprintf asnprintf basename dirfd dirname \
 	fgetln flock fparseln futimes getopt getopt_long \
 	isblank issetugid lchmod lchown lutimes mkstemp mkdtemp \
-	pread pwcache_userdb pwrite random setenv setgroupent \
+	poll pread pwcache_userdb pwrite random setenv setgroupent \
 	setprogname setpassent snprintf strlcat strlcpy strsep \
 	user_from_uid vasprintf vasnprintf vsnprintf
 do
diff --git a/tools/compat/configure.ac b/tools/compat/configure.ac
index 5a9a95578f26..2a5db9f35a6c 100644
--- a/tools/compat/configure.ac
+++ b/tools/compat/configure.ac
@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.24 2002/09/16 04:10:37 briggs Exp $
+#	$NetBSD: configure.ac,v 1.25 2002/10/04 22:10:10 thorpej Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -30,7 +30,7 @@ AC_CHECK_LIB(z, gzdopen,,
 AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
 	sys/stat.h sys/time.h sys/types.h sys/utsname.h sys/wait.h \
 	assert.h ctype.h errno.h fcntl.h grp.h limits.h locale.h \
-	netdb.h pwd.h signal.h stdarg.h stdio.h stdlib.h string.h \
+	netdb.h poll.h pwd.h signal.h stdarg.h stdio.h stdlib.h string.h \
 	termios.h unistd.h,,
 	AC_MSG_ERROR([standard system header file not found]))
 
@@ -96,7 +96,7 @@ AC_SEARCH_LIBS(fparseln, util)
 AC_CHECK_FUNCS(asprintf asnprintf basename dirfd dirname \
 	fgetln flock fparseln futimes getopt getopt_long \
 	isblank issetugid lchmod lchown lutimes mkstemp mkdtemp \
-	pread pwcache_userdb pwrite random setenv setgroupent \
+	poll pread pwcache_userdb pwrite random setenv setgroupent \
 	setprogname setpassent snprintf strlcat strlcpy strsep \
 	user_from_uid vasprintf vasnprintf vsnprintf)