diff --git a/demumble.cc b/demumble.cc
index dd76b8d..d1a5e3e 100644
--- a/demumble.cc
+++ b/demumble.cc
@@ -30,6 +30,7 @@
 "\n"
 "options:\n"
 "  -m         only print mangled names that were demangled, omit other output\n"
+"  -u         use unbuffered output\n"
 "  --version  print demumble version (\"%s\")\n", kDemumbleVersion);
 }
 
@@ -80,6 +81,8 @@
       return 0;
     } else if (strcmp(argv[1], "-m") == 0) {
       print_mode = kPrintMatching;
+    } else if (strcmp(argv[1], "-u") == 0) {
+      setbuf(stdout, NULL);
     } else if (strcmp(argv[1], "--version") == 0) {
       printf("%s\n", kDemumbleVersion);
       return 0;