diff --git a/code/bngblaster/src/bbl.c b/code/bngblaster/src/bbl.c
index d1212c12..35c8b7e5 100644
--- a/code/bngblaster/src/bbl.c
+++ b/code/bngblaster/src/bbl.c
@@ -435,6 +435,9 @@ main(int argc, char *argv[])
         exit(2);
     }
 
+    setvbuf(stdout, NULL, _IOLBF, 0);
+    setvbuf(stderr, NULL, _IONBF, 0);
+
     /* Clear logging global array. */
     memset(log_id, 0, sizeof(struct log_id_) * LOG_ID_MAX);
     log_id[INFO].enable = true;
diff --git a/code/common/src/logging.c b/code/common/src/logging.c
index 501319e2..e779a7c1 100644
--- a/code/common/src/logging.c
+++ b/code/common/src/logging.c
@@ -65,6 +65,9 @@ log_open()
         return;
     }
     g_log_fp = fopen(g_log_file, "a");
+    if(g_log_fp) {
+        setvbuf(g_log_fp, NULL, _IOLBF, 0);
+    }
 }
 
 /*