diff --git a/media-dispatcher b/media-dispatcher
index 347bba8..b81988f 100644
--- a/media-dispatcher
+++ b/media-dispatcher
@@ -1,80 +1,80 @@
 #!/usr/bin/env python
 
 
 if __name__ == '__main__':
     import mediaproxy
     import sys
 
     from application import log
     from application.configuration import ConfigFile, datatypes
     from application.process import process, ProcessError
     from argparse import ArgumentParser
 
     name = 'media-dispatcher'
     fullname = 'MediaProxy Dispatcher'
     description = 'MediaProxy Dispatcher component'
 
     process.configuration.user_directory = None
     process.configuration.subdirectory = mediaproxy.mediaproxy_subdirectory
     process.runtime.subdirectory = mediaproxy.mediaproxy_subdirectory
 
     parser = ArgumentParser(usage='%(prog)s [options]')
     parser.add_argument('--version', action='version', version='%(prog)s {}'.format(mediaproxy.__version__))
     parser.add_argument('--systemd', action='store_true', help='run as a systemd simple service and log to journal')
     parser.add_argument('--no-fork', action='store_false', dest='fork', help='run in the foreground and log to the terminal')
     parser.add_argument('--config-dir', dest='config_directory', default=None, help='the configuration directory ({})'.format(process.configuration.system_directory), metavar='PATH')
     parser.add_argument('--runtime-dir', dest='runtime_directory', default=None, help='the runtime directory ({})'.format(process.runtime.directory), metavar='PATH')
     parser.add_argument('--debug', action='store_true', help='enable verbose logging')
     parser.add_argument('--debug-memory', action='store_true', help='enable memory debugging')
 
     options = parser.parse_args()
 
     log.Formatter.prefix_format = '{record.levelname:<8s} '
 
     if options.config_directory is not None:
         process.configuration.local_directory = options.config_directory
     if options.runtime_directory is not None:
         process.runtime.directory = options.runtime_directory
 
     config_file = ConfigFile(mediaproxy.configuration_file)
     log.level.current = config_file.get_setting('Dispatcher', 'log_level', type=datatypes.LogLevel, default=log.level.DEBUG)
 
     try:
         process.runtime.create_directory()
     except ProcessError as e:
         log.critical('Cannot start %s: %s' % (fullname, e))
         sys.exit(1)
 
     if options.systemd:
         from systemd.journal import JournalHandler
         log.set_handler(JournalHandler(SYSLOG_IDENTIFIER=name))
         log.capture_output()
     elif options.fork:
         try:
-            process.daemonize(options.pid_file)
+            process.daemonize(pidfile='{}.pid'.format(name))
         except ProcessError as e:
             log.critical('Cannot start %s: %s' % (fullname, e))
             sys.exit(1)
         log.use_syslog(name)
 
     log.info('Starting %s %s' % (fullname, mediaproxy.__version__))
 
     from mediaproxy.dispatcher import Dispatcher
 
     if options.debug:
         log.level.current = log.level.DEBUG
     if options.debug_memory:
         from application.debug.memory import memory_dump
 
     try:
         dispatcher = Dispatcher()
     except Exception as e:
         log.critical('Failed to create %s: %s' % (fullname, e))
         if type(e) is not RuntimeError:
             log.exception()
         sys.exit(1)
 
     dispatcher.run()
 
     if options.debug_memory:
         memory_dump()