diff --git a/master/buildbot/scripts/runner.py b/master/buildbot/scripts/runner.py
index 12ff17e691d..2ef681c23e5 100644
--- a/master/buildbot/scripts/runner.py
+++ b/master/buildbot/scripts/runner.py
@@ -143,6 +143,7 @@ class RestartOptions(base.BasedirMixin, base.SubcommandOptions):
     subcommandFunction = "buildbot.scripts.restart.restart"
     optFlags = [
         ['quiet', 'q', "Don't display startup log messages"],
+        ['nodaemon', None, "Don't daemonize"],
         ]
     def getSynopsis(self):
         return "Usage:    buildbot restart [<basedir>]"
@@ -152,6 +153,7 @@ class StartOptions(base.BasedirMixin, base.SubcommandOptions):
     subcommandFunction = "buildbot.scripts.start.start"
     optFlags = [
         ['quiet', 'q', "Don't display startup log messages"],
+        ['nodaemon', None, "Don't daemonize"],
         ]
     def getSynopsis(self):
         return "Usage:    buildbot start [<basedir>]"
diff --git a/master/buildbot/scripts/start.py b/master/buildbot/scripts/start.py
index 6027885a95a..4df586567b3 100644
--- a/master/buildbot/scripts/start.py
+++ b/master/buildbot/scripts/start.py
@@ -71,6 +71,8 @@ def launch(config):
             "--no_save",
             "--logfile=twistd.log", # windows doesn't use the same default
             "--python=buildbot.tac"]
+    if config['nodaemon']:
+        argv.extend(['--nodaemon'])
     sys.argv = argv
 
     # this is copied from bin/twistd. twisted-2.0.0 through 2.4.0 use