diff --git a/ChangeLog b/ChangeLog
index ac7bca6..64b4678 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    - markus@cvs.openbsd.org 2001/04/08 13:03:00
      [ssh-add.c]
      init pointers with NULL, thanks to danimal@danimal.org
+   - markus@cvs.openbsd.org 2001/04/08 11:27:33
+     [clientloop.c]
+     leave_raw_mode if ssh2 "session" is closed
 
 20010408
  - OpenBSD CVS Sync
@@ -4946,4 +4949,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1081 2001/04/08 18:04:36 mouring Exp $
+$Id: ChangeLog,v 1.1082 2001/04/08 18:07:22 mouring Exp $
diff --git a/clientloop.c b/clientloop.c
index ad20b2f..94d2ec6 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.60 2001/04/05 21:05:23 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.61 2001/04/08 11:27:33 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -796,6 +796,8 @@
 		error("client_channel_closed: id %d != session_ident %d",
 		    id, session_ident);
 	session_closed = 1;
+	if (in_raw_mode)
+		leave_raw_mode();
 }
 
 /*