diff --git a/ChangeLog b/ChangeLog
index d2010531d..58dd8d273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-21  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: Replacement function for timegm().  No need to
+	check for setenv() any longer.
+
 2004-05-20  David Shaw  <dshaw@jabberwocky.com>
 
 	* NEWS: Note HTTP key fetching.
diff --git a/configure.ac b/configure.ac
index 087619f11..2e6bf9fd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -758,11 +758,11 @@ AC_FUNC_FSEEKO
 AC_FUNC_VPRINTF
 AC_FUNC_FORK
 AC_CHECK_FUNCS(strerror stpcpy strsep strlwr tcgetattr strtoul mmap)
-AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid times timegm)
+AC_CHECK_FUNCS(strcasecmp strncasecmp ctermid times unsetenv)
 AC_CHECK_FUNCS(memmove gettimeofday getrusage setrlimit clock_gettime)
 AC_CHECK_FUNCS(atexit raise getpagesize strftime nl_langinfo setlocale)
 AC_CHECK_FUNCS(waitpid wait4 sigaction sigprocmask rand pipe stat getaddrinfo)
-AC_REPLACE_FUNCS(mkdtemp setenv unsetenv)
+AC_REPLACE_FUNCS(mkdtemp timegm)
 AC_CHECK_TYPES([struct sigaction, sigset_t],,,[#include <signal.h>])
 
 # See if getopt is in libiberty.  This is of course not optimal since