diff --git a/lib/constants.py b/lib/constants.py
index f616020724ae32098db4e9a551b2673ebf43ee28..053ee04a5935bac82305c47d33b63ab98b6b8821 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -93,7 +93,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 + "/ganeti-master.sock"
+MASTER_SOCKET = RUN_GANETI_DIR + "/master.sock"
 
 NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
 DEFAULT_NODED_PORT = 1811