diff --git a/ChangeLog b/ChangeLog
index 0ce7f8c6b..c8bd1ae9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,12 @@
    - markus@cvs.openbsd.org 2006/06/08 14:45:49
      [readpass.c sshconnect.c sshconnect2.c uidswap.c uidswap.h]
      do not set the gid, noted by solar; ok djm
+   - djm@cvs.openbsd.org 2006/06/13 01:18:36
+     [ssh-agent.c]
+     always use a format string, even when printing a constant
+   - djm@cvs.openbsd.org 2006/06/13 02:17:07
+     [ssh-agent.c]
+     revert; i am on drugs. spotted by alexander AT beard.se
 
 20060521
  - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4678,4 +4684,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4342 2006/06/13 03:10:00 djm Exp $
+$Id: ChangeLog,v 1.4343 2006/06/13 03:10:18 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index 656e399d4..db3935ec7 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.138 2006/05/17 12:43:34 markus Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.140 2006/06/13 02:17:07 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland