diff --git a/ChangeLog b/ChangeLog
index 0abbd02eb..ebefbd48f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,11 @@
      [sshd_config.5]
      add AllowAgentForwarding to available Match keywords list
      ok djm
+   - djm@cvs.openbsd.org 2009/01/01 21:14:35
+     [channels.c]
+     call channel destroy callbacks on receipt of open failure messages.
+     fixes client hangs when connecting to a server that has MaxSessions=0
+     set spotted by imorgan AT nas.nasa.gov; ok markus@
 
 20090107
  - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5040,5 +5045,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5168 2009/01/28 05:20:17 djm Exp $
+$Id: ChangeLog,v 1.5169 2009/01/28 05:22:34 djm Exp $
 
diff --git a/channels.c b/channels.c
index c0d335921..d138882b3 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.290 2008/12/09 03:20:42 stevesk Exp $ */
+/* $OpenBSD: channels.c,v 1.291 2009/01/01 21:14:35 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2311,8 +2311,8 @@ channel_input_open_failure(int type, u_int32_t seq, void *ctxt)
 			xfree(lang);
 	}
 	packet_check_eom();
-	/* Free the channel.  This will also close the socket. */
-	channel_free(c);
+	/* Schedule the channel for cleanup/deletion. */
+	chan_mark_dead(c);
 }
 
 /* ARGSUSED */