diff --git a/ChangeLog b/ChangeLog
index 6f86f036be..391d153f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-11-03  Marcus Brinkmann  <marcus@gnu.org>
 
+	* sysdeps/generic/sysconf.c: Include <grp.h> and <pwd.h>.
+
 	* sysdeps/generic/tempname.c (__path_search): Add missing argument
 	TRY_TMPDIR.
 
diff --git a/sysdeps/generic/sysconf.c b/sysdeps/generic/sysconf.c
index d67e3568a3..f22685cb29 100644
--- a/sysdeps/generic/sysconf.c
+++ b/sysdeps/generic/sysconf.c
@@ -18,6 +18,8 @@
    02111-1307 USA.  */
 
 #include <errno.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <time.h>