diff --git a/ChangeLog b/ChangeLog
index 049a1d861..d5f57e37e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,12 @@
      subprocesses it may have started (e.g. forked askpass). Fixes
      agent sockets being zapped when askpass processes fatal();
      bz#2236 patch from Dmitry V. Levin
+   - djm@cvs.openbsd.org 2014/07/03 03:15:01
+     [ssh-add.c]
+     make stdout line-buffered; saves partial output getting lost when
+     ssh-add fatal()s part-way through (e.g. when listing keys from an
+     agent that supports key types that ssh-add doesn't);
+     bz#2234, reported by Phil Pennock
 
 20140702
  - OpenBSD CVS Sync
diff --git a/ssh-add.c b/ssh-add.c
index 07558ae52..058894087 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.111 2014/06/27 18:50:39 markus Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.112 2014/07/03 03:15:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -437,6 +437,8 @@ main(int argc, char **argv)
 
 	OpenSSL_add_all_algorithms();
 
+	setlinebuf(stdout);
+
 	/* At first, get a connection to the authentication agent. */
 	ac = ssh_get_authentication_connection();
 	if (ac == NULL) {