diff --git a/src/tty.c b/src/tty.c
index bee6f9f..afef44b 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -234,6 +234,10 @@ void stdout_configure(void)
 {
     int status;
 
+    /* Disable line buffering in stdout. This is necessary if we
+     * want things like local echo to work correctly. */
+    setbuf(stdout, NULL);
+
     /* Save current stdout settings */
     if (tcgetattr(STDOUT_FILENO, &stdout_old) < 0)
     {