diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 8ae1d4cf01c0c6c7d251743b218030ef9cb5f43f..dd59d83669cc2ec2b33e4b3e1518441d1ee6921c 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -474,6 +474,7 @@ def main():
 
   options, args = ParseOptions()
   utils.no_fork = True
+  daemon_name = constants.MASTERD
 
   if options.fork:
     utils.CloseFDs()
@@ -511,11 +512,12 @@ def main():
 
   # become a daemon
   if options.fork:
-    utils.Daemonize(logfile=constants.LOG_MASTERDAEMON)
+    utils.Daemonize(logfile=constants.DAEMONS_LOGFILES[daemon_name])
 
   utils.WritePidFile(constants.MASTERD_PID)
   try:
-    utils.SetupLogging(constants.LOG_MASTERDAEMON, debug=options.debug,
+    utils.SetupLogging(constants.DAEMONS_LOGFILES[daemon_name],
+                       debug=options.debug,
                        stderr_logging=not options.fork, multithreaded=True)
 
     logging.info("Ganeti master daemon startup")
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index e1482ad5cefb88828001398bccf6ea1d211b7322..edbc35c1540e765a0412c3e0f36fd74ccf77f115 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -762,6 +762,7 @@ def main():
 
   """
   global queue_lock
+  daemon_name = constants.NODED
 
   options, args = ParseOptions()
 
@@ -782,11 +783,12 @@ def main():
 
   # become a daemon
   if options.fork:
-    utils.Daemonize(logfile=constants.LOG_NODESERVER)
+    utils.Daemonize(logfile=constants.DAEMONS_LOGFILES[daemon_name])
 
   utils.WritePidFile(constants.NODED_PID)
   try:
-    utils.SetupLogging(logfile=constants.LOG_NODESERVER, debug=options.debug,
+    utils.SetupLogging(logfile=constants.DAEMONS_LOGFILES[daemon_name],
+                       debug=options.debug,
                        stderr_logging=not options.fork)
     logging.info("ganeti node daemon startup")
 
diff --git a/daemons/ganeti-rapi b/daemons/ganeti-rapi
index 3f0bb8cc1fe5e39e1897a1d46a10bb6f1cfca920..16ddb9ddbaffda017c3882be12f3402a3b21f2aa 100755
--- a/daemons/ganeti-rapi
+++ b/daemons/ganeti-rapi
@@ -225,6 +225,7 @@ def main():
 
   """
   options, args = ParseOptions()
+  daemon_name = constants.RAPI
 
   if options.fork:
     utils.CloseFDs()
@@ -244,9 +245,9 @@ def main():
   port = utils.GetDaemonPort(constants.RAPI)
 
   if options.fork:
-    utils.Daemonize(logfile=constants.LOG_RAPISERVER)
+    utils.Daemonize(logfile=constants.DAEMONS_LOGFILES[daemon_name])
 
-  utils.SetupLogging(constants.LOG_RAPISERVER, debug=options.debug,
+  utils.SetupLogging(constants.DAEMONS_LOGFILES[daemon_name], debug=options.debug,
                      stderr_logging=not options.fork)
 
   utils.WritePidFile(constants.RAPI_PID)
diff --git a/lib/constants.py b/lib/constants.py
index 33dddbbb356ad7e3d4419722e60bff2795a82914..90aa0e955ab990b8139e5c37a66fc24358b1829d 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -118,6 +118,7 @@ NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
 
 NODED = "ganeti-noded"
 RAPI = "ganeti-rapi"
+MASTERD = "ganeti-masterd"
 
 DAEMONS_PORTS = {
   # daemon-name: ("proto", "default-port")
@@ -132,11 +133,14 @@ LAST_DRBD_PORT = 14999
 MASTER_SCRIPT = "ganeti-master"
 
 LOG_DIR = _autoconf.LOCALSTATEDIR + "/log/ganeti/"
+DAEMONS_LOGFILES = {
+ # "daemon-name": "logfile"
+ NODED: LOG_DIR + "node-daemon.log",
+ RAPI: LOG_DIR + "rapi-daemon.log",
+ MASTERD: LOG_DIR + "master-daemon.log",
+}
 LOG_OS_DIR = LOG_DIR + "os"
-LOG_NODESERVER = LOG_DIR + "node-daemon.log"
 LOG_WATCHER = LOG_DIR + "watcher.log"
-LOG_MASTERDAEMON = LOG_DIR + "master-daemon.log"
-LOG_RAPISERVER = LOG_DIR + "rapi-daemon.log"
 LOG_COMMANDS = LOG_DIR + "commands.log"
 LOG_BURNIN = LOG_DIR + "burnin.log"