2 files changed, 3 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ab110c61..73b4a6973 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
  - (djm) Makefile.in fixes
  - (stevesk) add mysignal() wrapper and use it for the protocol 2
    SIGCHLD handler.
+ - (djm) Use setvbuf() instead of setlinebuf(). Suggest from stevek@
 
 20010103
  - (bal) Cygwin clean up by Corinna Vinschen <vinschen@redhat.com>
diff --git a/sftp-int.c b/sftp-int.c
index f050c098e..bdb470b1c 100644
--- a/sftp-int.c
+++ b/sftp-int.c
@@ -560,8 +560,8 @@ interactive_loop(int fd_in, int fd_out)
         if (pwd == NULL)
                 fatal("Need cwd");
 
-        setlinebuf(stdout);
-        setlinebuf(stdin);
+        setvbuf(stdout, (char *)NULL, _IOLBF, 0);
+        setvbuf(stdin, (char *)NULL, _IOLBF, 0);
 
         for(;;) {
                 char *cp;