diff --git a/ChangeLog b/ChangeLog
index b0593e146..330843618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020521
+ - (stevesk) [sshd.c] bug 245; disable setsid() for now
+
 20020517
  - (tim) [configure.ac] remove extra MD5_MSG="no" line.
 
@@ -656,4 +659,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2135 2002/05/17 15:59:22 tim Exp $
+$Id: ChangeLog,v 1.2136 2002/05/21 17:50:21 stevesk Exp $
diff --git a/sshd.c b/sshd.c
index 45ccb3d47..82520b8b0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1336,8 +1336,11 @@ main(int ac, char **av)
 	 * setlogin() affects the entire process group.  We don't
 	 * want the child to be able to affect the parent.
 	 */
+#if 0
+	/* XXX: this breaks Solaris */
 	if (setsid() < 0)
 		error("setsid: %.100s", strerror(errno));
+#endif
 
 	/*
 	 * Disable the key regeneration alarm.  We will not regenerate the