diff --git a/ChangeLog b/ChangeLog
index d2440babc..19e8ca3b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20000829
+ - (djm) Fix ^C ignored issue on Solaris. Diagnosis from Gert 
+   Doering <gert@greenie.muc.de>, John Horne <J.Horne@plymouth.ac.uk> and 
+   Garrick James <garrick@james.net>
+
 20000823
  - (djm) Define USE_PIPES to avoid socketpair problems on HPUX 10 and SunOS 4
    Avoids "scp never exits" problem. Reports from Lutz Jaenicke 
diff --git a/sshd.c b/sshd.c
index ae02f2c40..e3903c783 100644
--- a/sshd.c
+++ b/sshd.c
@@ -956,6 +956,7 @@ main(int ac, char **av)
 	signal(SIGTERM, SIG_DFL);
 	signal(SIGQUIT, SIG_DFL);
 	signal(SIGCHLD, SIG_DFL);
+	signal(SIGINT, SIG_DFL);
 
 	/*
 	 * Set socket options for the connection.  We want the socket to