diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index 1de54d50be..ad4e15af07 100644
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -656,6 +656,9 @@ main(int argc, char **argv)
 {
     int code;
 
+    setvbuf(stdout, NULL, _IONBF, 0);
+    setvbuf(stderr, NULL, _IONBF, 0);
+
     afsd_init_syscall_opcodes();
     afsd_init();