diff --git a/ChangeLog b/ChangeLog
index 131a90351..2cce70628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    one entry per line to make it easier to merge changes.  ok djm@
  - (dtucker) [configure.ac] strsep() may be defined in string.h, so check
    for its presence and include it in the strsep check.
+ - (dtucker) [configure.ac] getpgrp may be defined in unistd.h, so check for
+   its presence before doing AC_FUNC_GETPGRP.
 
 20050527
  - (djm) [defines.h] Use our realpath if we have to define PATH_MAX, spotted by
@@ -2621,4 +2623,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3794 2005/05/28 06:54:36 dtucker Exp $
+$Id: ChangeLog,v 1.3795 2005/05/28 06:57:00 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 7767e9080..863531f7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.266 2005/05/28 06:54:36 dtucker Exp $
+# $Id: configure.ac,v 1.267 2005/05/28 06:57:00 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -589,6 +589,7 @@ AC_CHECK_HEADERS( \
 	time.h \
 	tmpdir.h \
 	ttyent.h \
+	unistd.h \
 	usersec.h \
 	util.h \
 	utime.h \