diff --git a/ChangeLog b/ChangeLog
index 622b0001d9..a09a398bbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1999-07-26  Ulrich Drepper  <drepper@cygnus.com>
 
+	* sysdeps/unix/sysv/sysv4/setsid.c: Correct types.
+	* sysdeps/generic/getpgrp.c: Likewise.
+	* sysdeps/unix/sysv/sysv4/setpgid.c: Likewise.
+	* sysdeps/unix/sysv/sysv4/getpgid.c: Likewise.
+	Patch by John Tobey <jtobey@banta-im.com>.
+
 	* sysdeps/posix/wait3.c: Help compiling in presence of
 	__transparent_union__.  Reported by John Tobey <jtobey@banta-im.com>.
 
diff --git a/sysdeps/generic/getpgrp.c b/sysdeps/generic/getpgrp.c
index 805fbfb808..5b3b769cbe 100644
--- a/sysdeps/generic/getpgrp.c
+++ b/sysdeps/generic/getpgrp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 /* Get the process group ID of the calling process.  */
-int
+pid_t
 getpgrp (void)
 {
   return __getpgid (0);
diff --git a/sysdeps/unix/sysv/sysv4/getpgid.c b/sysdeps/unix/sysv/sysv4/getpgid.c
index 3195e6cddd..d2b27cb060 100644
--- a/sysdeps/unix/sysv/sysv4/getpgid.c
+++ b/sysdeps/unix/sysv/sysv4/getpgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,14 +16,13 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <errno.h>
 #include <unistd.h>
 #include <sys/types.h>
 
-extern int __pgrpsys __P ((int type, ...));
+extern pid_t __pgrpsys __P ((int type, ...));
 
 /* Get the process group ID of process PID.  */
-int
+pid_t
 __getpgid (pid)
      pid_t pid;
 {
diff --git a/sysdeps/unix/sysv/sysv4/setpgid.c b/sysdeps/unix/sysv/sysv4/setpgid.c
index 46396322d2..d9d3e8f306 100644
--- a/sysdeps/unix/sysv/sysv4/setpgid.c
+++ b/sysdeps/unix/sysv/sysv4/setpgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,14 +19,14 @@
 #include <errno.h>
 #include <unistd.h>
 
-extern int __pgrpsys __P ((int type, ...));
+extern int __pgrpsys __P ((pid_t type, ...));
 
 /* Set the process group ID of the process matching PID to PGID.
    If PID is zero, the current process's process group ID is set.
    If PGID is zero, the process ID of the process is used.  */
 int
 __setpgid (pid, pgid)
-     int pid, pgid;  /* XXX why not pid_t ? */
+     pid_t pid, pgid;
 {
   return __pgrpsys (5, pid, pgid);
 }
diff --git a/sysdeps/unix/sysv/sysv4/setsid.c b/sysdeps/unix/sysv/sysv4/setsid.c
index 37998bfe03..638ab73889 100644
--- a/sysdeps/unix/sysv/sysv4/setsid.c
+++ b/sysdeps/unix/sysv/sysv4/setsid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,12 +19,12 @@
 #include <errno.h>
 #include <unistd.h>
 
-extern int __pgrpsys __P ((int type, ...));
+extern pid_t __pgrpsys __P ((int type, ...));
 
 /* Create a new session with the calling process as its leader.
    The process group IDs of the session and the calling process
    are set to the process ID of the calling process, which is returned.  */
-int
+pid_t
 __setsid ()
 {
   return __pgrpsys (3);