diff --git a/lib/mail_catcher.rb b/lib/mail_catcher.rb
index 9e78f15..69e8c9f 100644
--- a/lib/mail_catcher.rb
+++ b/lib/mail_catcher.rb
@@ -142,6 +142,11 @@ module MailCatcher extend self
     # Stash them away for later
     @@options = options
 
+    # If we're running in the foreground sync the output.
+    unless options[:daemon]
+      $stdout.sync = $stderr.sync = true
+    end
+
     puts "Starting MailCatcher"
 
     Thin::Logging.silent = true