diff --git a/ChangeLog b/ChangeLog
index a620aa17..e2b14315 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-20  Werner Koch  <wk@gnupg.org>
+
+	* configure.ac (AC_CHECK_HEADERS): Check for sys/select.h.
+
 2002-09-04  Marcus Brinkmann  <marcus@g10code.de>
 
 	* autogen.sh (autoconf_vers): Bump up to 2.53 to get the @&t@
diff --git a/configure.ac b/configure.ac
index 62f66c78..831065e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,9 @@ dnl FIXME: check whether Bonobo is installed
 dnl
 dnl Checks for header files.
 dnl
+AC_CHECK_HEADERS(sys/select.h)
+
+
 
 dnl
 dnl Checks for typedefs and structures.
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 3e90b75b..325a0648 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-20  Werner Koch  <wk@gnupg.org>
+
+	* ath.c: Include sys/time.h if sys/select.h is not available.
+
 2002-09-13  Marcus Brinkmann  <marcus@g10code.de>
 
 	* keylist.c (keylist_status_handler): Do not call finish_key() here.
diff --git a/gpgme/ath.c b/gpgme/ath.c
index e685031b..1d8d94be 100644
--- a/gpgme/ath.c
+++ b/gpgme/ath.c
@@ -23,7 +23,11 @@
 #endif
 
 #include <unistd.h>
-#include <sys/select.h>
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#else
+# include <sys/time.h>
+#endif
 #include <sys/types.h>
 #include <sys/wait.h>