diff --git a/ChangeLog b/ChangeLog
index 2c998748e..b19f41cf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20120704
+ - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] Add setlinebuf for
+   platforms that don't have it.  "looks good" tim@
+
 20120703
  - (dtucker) [configure.ac] Detect platforms that can't use select(2) with
    setrlimit(RLIMIT_NOFILE, rl_zero) and disable the rlimit sandbox on those.
diff --git a/configure.ac b/configure.ac
index f7033bc0b..da919a636 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.494 2012/07/03 12:48:31 dtucker Exp $
+# $Id: configure.ac,v 1.495 2012/07/03 22:50:10 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.494 $)
+AC_REVISION($Revision: 1.495 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -1571,6 +1571,7 @@ AC_CHECK_FUNCS([ \
 	seteuid \
 	setgroupent \
 	setgroups \
+	setlinebuf \
 	setlogin \
 	setpassent\
 	setpcred \
diff --git a/openbsd-compat/bsd-misc.h b/openbsd-compat/bsd-misc.h
index e37175625..eac5217ca 100644
--- a/openbsd-compat/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
@@ -1,4 +1,4 @@
-/* $Id: bsd-misc.h,v 1.20 2012/02/14 18:03:31 tim Exp $ */
+/* $Id: bsd-misc.h,v 1.21 2012/07/03 22:50:10 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
@@ -51,6 +51,9 @@ int setegid(uid_t);
 const char *strerror(int);
 #endif 
 
+#if !defined(HAVE_SETLINEBUF)
+#define setlinebuf(a)	(setvbuf((a), NULL, _IOLBF, 0))
+#endif
 
 #ifndef HAVE_UTIMES
 #ifndef HAVE_STRUCT_TIMEVAL