diff --git a/src/mech/clixon.xml.in b/src/mech/clixon.xml.in
index 9a1ea787..0ab9bd7f 100644
--- a/src/mech/clixon.xml.in
+++ b/src/mech/clixon.xml.in
@@ -13,9 +13,9 @@
   <CLICON_RESTCONF_DIR>@LIBDIR@/clixon/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>@LIBDIR@/clixon/cli</CLICON_CLI_DIR>
   <CLICON_CLISPEC_DIR>@LIBDIR@/clixon/clispec</CLICON_CLISPEC_DIR>
-  <CLICON_SOCK>@LOCALSTATEDIR@/clixon/backend.sock</CLICON_SOCK>
+  <CLICON_SOCK>@RUNSTATEDIR@/clixon/backend.sock</CLICON_SOCK>
   <CLICON_SOCK_GROUP>clicon</CLICON_SOCK_GROUP>
-  <CLICON_BACKEND_PIDFILE>@RUNSTATEDIR@/clixon_backend.pid</CLICON_BACKEND_PIDFILE>
+  <CLICON_BACKEND_PIDFILE>@RUNSTATEDIR@/clixon/backend.pid</CLICON_BACKEND_PIDFILE>
   <CLICON_CLI_LINESCROLLING>0</CLICON_CLI_LINESCROLLING>
   <CLICON_CLI_TAB_MODE>0</CLICON_CLI_TAB_MODE>
   <CLICON_XMLDB_DIR>/mnt/tmp/infix/db</CLICON_XMLDB_DIR>