diff --git a/ChangeLog b/ChangeLog
index 922d15e0c..2ad6e2a65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010612
+  - markus@cvs.openbsd.org 2001/06/10 11:29:20
+     [dispatch.c]
+     we support rekeying
+     protocol errors are fatal.
+
 20010611
  - (bal) NeXT/MacOS X lack libgen.h and dirname().  Patch by Mark Miller 
    <markm@swoon.net> 
@@ -5602,4 +5608,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1276 2001/06/10 17:43:35 mouring Exp $
+$Id: ChangeLog,v 1.1277 2001/06/12 00:12:56 mouring Exp $
diff --git a/dispatch.c b/dispatch.c
index 7168d1c74..64873d53a 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: dispatch.c,v 1.10 2001/02/18 18:33:53 markus Exp $");
+RCSID("$OpenBSD: dispatch.c,v 1.11 2001/06/10 11:29:20 markus Exp $");
 
 #include "ssh1.h"
 #include "ssh2.h"
@@ -39,9 +39,7 @@ dispatch_fn *dispatch[DISPATCH_MAX];
 void
 dispatch_protocol_error(int type, int plen, void *ctxt)
 {
-	error("Hm, dispatch protocol error: type %d plen %d", type, plen);
-	if (compat20 && type == SSH2_MSG_KEXINIT)
-		fatal("dispatch_protocol_error: rekeying is not supported");
+	fatal("dispatch_protocol_error: type %d plen %d", type, plen);
 }
 void
 dispatch_init(dispatch_fn *dflt)