diff --git a/lib/constants.py b/lib/constants.py
index 1236b793dfd8243454338e0b1a1ae2ebf2a264ee..3a62f0d78ea22899b1bbc0300622acc73408ca11 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -57,7 +57,7 @@ WATCHER_STATEFILE = DATA_DIR + "/watcher.data"
 SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
 ETC_HOSTS = "/etc/hosts"
 DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
-MASTER_SOCKET = RUN_DIR + "/master.sock"
+MASTER_SOCKET = RUN_DIR + "/ganeti-master.sock"
 
 NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
 DEFAULT_NODED_PORT = 1811