diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 51f376c77..d655e0731 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -259,6 +259,7 @@ main (int argc, char **argv, char **env)
 
   /* Initialize user input buffer. */
   line_read = NULL;
+  setlinebuf(stdout);
 
   /* Signal and others. */
   vtysh_signal_init ();