diff --git a/ChangeLog b/ChangeLog
index 90ee86ac8..e4cff0070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,6 +117,9 @@
      making the function names more consistent - making ssh.c and
      clientloop.c a fair bit more readable.
      ok markus@
+   - djm@cvs.openbsd.org 2008/05/09 14:26:08
+     [ssh.c]
+     dingo stole my diff hunk
 
 20080403
  - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3977,4 +3980,4 @@
    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.4926 2008/05/19 06:00:08 djm Exp $
+$Id: ChangeLog,v 1.4927 2008/05/19 06:02:37 djm Exp $
diff --git a/ssh.c b/ssh.c
index c944d0ad6..3bcca53ee 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.312 2008/05/09 14:18:44 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.313 2008/05/09 14:26:08 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland