diff --git a/ChangeLog b/ChangeLog
index cdf6376fa..2464c33a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,6 +122,9 @@
    - markus@cvs.openbsd.org 2002/01/10 12:47:59
      [nchan.c]
      more unused code (with channels.c:1.156)
+   - markus@cvs.openbsd.org 2002/01/11 10:31:05
+     [packet.c]
+     handle received SSH2_MSG_UNIMPLEMENTED messages; ok djm@
 
 
 20020121
@@ -7270,4 +7273,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1758 2002/01/22 12:22:44 djm Exp $
+$Id: ChangeLog,v 1.1759 2002/01/22 12:23:11 djm Exp $
diff --git a/packet.c b/packet.c
index 5d97c379e..3b3faeeaf 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.83 2001/12/29 21:56:01 stevesk Exp $");
+RCSID("$OpenBSD: packet.c,v 1.84 2002/01/11 10:31:05 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -892,7 +892,7 @@ packet_read_poll2(u_int32_t *seqnr_p)
 int
 packet_read_poll_seqnr(u_int32_t *seqnr_p)
 {
-	int reason;
+	int reason, seqnr;
 	u_char type;
 	char *msg;
 
@@ -920,6 +920,10 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
 				xfree(msg);
 				fatal_cleanup();
 				break;
+			case SSH2_MSG_UNIMPLEMENTED:
+				seqnr = packet_get_int();
+				debug("Received SSH2_MSG_UNIMPLEMENTED for %d", seqnr);
+				break;
 			default:
 				return type;
 				break;