diff --git a/ChangeLog b/ChangeLog
index 7284e437f..46b6d0f48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
    - rees@cvs.openbsd.org 2002/03/26 18:46:59
      [scard.c]
      try_AUT0 in read_pubkey too, for those paranoid few who want to acl 'sh'
+   - markus@cvs.openbsd.org 2002/03/26 22:50:39
+     [channels.h]
+     CHANNEL_EFD_OUTPUT_ACTIVE is false for CHAN_CLOSE_RCVD, too
 
 20020325
  - (stevesk) import OpenBSD <sys/tree.h> as "openbsd-compat/tree.h"
@@ -8077,4 +8080,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1997 2002/03/27 17:33:17 mouring Exp $
+$Id: ChangeLog,v 1.1998 2002/03/27 17:36:41 mouring Exp $
diff --git a/channels.h b/channels.h
index 0da2d4e5e..bd31c4558 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: channels.h,v 1.66 2002/03/25 21:13:51 markus Exp $	*/
+/*	$OpenBSD: channels.h,v 1.67 2002/03/26 22:50:39 markus Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -145,7 +145,7 @@ struct Channel {
 	buffer_len(&c->extended) > 0))
 #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \
 	(compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \
-	((c->efd != -1 && !(c->flags & CHAN_EOF_RCVD)) || \
+	((c->efd != -1 && !(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD))) || \
 	buffer_len(&c->extended) > 0))
 
 /* channel management */