diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index fd1f02374a55b10f2f013264d82fc0b19e63a678..e782642857e510f63e354ed6f8bbdd16302a0acb 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -329,6 +329,8 @@ def main():
     utils.Daemonize(logfile=constants.LOG_MASTERDAEMON,
                     noclose_fds=[master.fileno()])
 
+  utils.WritePidFile('ganeti-masterd')
+
   logger.SetupDaemon(constants.LOG_MASTERDAEMON, debug=options.debug,
                      stderr_logging=not options.fork)
 
@@ -339,6 +341,7 @@ def main():
     master.serve_forever()
   finally:
     master.server_cleanup()
+    utils.RemovePidFile('ganeti-masterd')
 
 
 if __name__ == "__main__":