diff --git a/ChangeLog b/ChangeLog
index 9c151996ab..2e02af6084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-18  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	[BZ #2178]
+	* sysdeps/mach/hurd/getsid.c (getsid): When parameter PID is zero,
+	use _hurd_pid instead.
+
 2006-02-20  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/alpha/soft-fp/Makefile (CPPFLAGS): Add soft-fp include
diff --git a/sysdeps/mach/hurd/getsid.c b/sysdeps/mach/hurd/getsid.c
index 57c10c58b7..9dcfa90fde 100644
--- a/sysdeps/mach/hurd/getsid.c
+++ b/sysdeps/mach/hurd/getsid.c
@@ -28,6 +28,9 @@ getsid (pid_t pid)
   error_t err;
   pid_t sid;
 
+  if (pid == 0)
+    pid = _hurd_pid;
+
   err = __USEPORT (PROC, __proc_getsid (port, pid, &sid));
   if (err)
     return (pid_t) __hurd_fail (err);