diff --git a/endlessh.c b/endlessh.c
index c6337f4..1e52e62 100644
--- a/endlessh.c
+++ b/endlessh.c
@@ -624,8 +624,7 @@ main(int argc, char **argv)
                 config_set_port(&config, optarg, 1);
                 break;
             case 'v':
-                if (!loglevel++)
-                    setvbuf(stdout, 0, _IOLBF, 0);
+                loglevel++;
                 break;
             case 'V':
                 print_version();
@@ -642,6 +641,9 @@ main(int argc, char **argv)
         exit(EXIT_FAILURE);
     }
 
+    /* Set output (log) to line buffered */
+    setvbuf(stdout, 0, _IOLBF, 0);
+
     /* Log configuration */
     config_log(&config);