diff --git a/alterator.spec b/alterator.spec
index 01dbad9..f2c0de6 100644
--- a/alterator.spec
+++ b/alterator.spec
@@ -1,6 +1,6 @@
 Name: alterator
-Version: 5.3
-Release: alt1.qa1
+Version: 5.4
+Release: alt1
 
 Summary: ALT Linux configurator engine
 License: GPLv2+
@@ -97,7 +97,6 @@ export LTDL_LIBRARY_PATH=src/libguile-gettext:src/libguile-pipe:%_libdir/guile/%
 ln -s ../bin/alterator-cmdline %buildroot%_sbindir/
 
 #create special directories
-mkdir -p %buildroot%_runtimedir/alteratord
 mkdir -p %buildroot%_cachedir/%name
 mkdir -p %buildroot%_localstatedir/%name
 mkdir -p %buildroot%_sysconfdir/%name
@@ -115,7 +114,7 @@ cat >%buildroot%_rpmmacrosdir/%name<<EOF
 EOF
 
 cat >%buildroot%_tmpfilesdir/%name.conf<<EOF
-d /var/run/alteratord 0710 root _alteratord -
+d /run/alteratord 0710 root _alteratord -
 EOF
 
 %pre
@@ -153,7 +152,6 @@ EOF
 %_sbindir/*
 %_initdir/*
 %_mandir/man?/*
-%attr(710,root,_alteratord) %dir /var/run/alteratord
 
 %_unitdir/alteratord.service
 %_unitdir/alteratord.socket
 
diff --git a/alterator/alteratord.init b/alterator/alteratord.init
index e8eae15..f61d120 100755
--- a/alterator/alteratord.init
+++ b/alterator/alteratord.init
@@ -7,15 +7,15 @@
 # processname: alteratord
 # config: /etc/alterator
 # description: system configurator
-# pidfile: /var/run/alteratord.pid
+# pidfile: /run/alteratord.pid
 
 WITHOUT_RC_COMPAT=1
 
 # Source function library.
 . /etc/init.d/functions
 
-PIDFILE=/var/run/alteratord.pid
-LOCKFILE=/var/lock/subsys/alteratord
+PIDFILE=/run/alteratord.pid
+LOCKFILE=/run/lock/subsys/alteratord
 RETVAL=0
 
 start()
diff --git a/alterator/interfaces/guile/d.scm b/alterator/interfaces/guile/d.scm
index dcbebbe..4202783 100644
--- a/alterator/interfaces/guile/d.scm
+++ b/alterator/interfaces/guile/d.scm
@@ -19,13 +19,13 @@
 
 (define *d-user* (passwd:name (getpwuid (getuid))))
 
-; /var/run/alteratord is also used in installer
+; /run/alteratord is also used in installer
 ; to bounce the socket between stage3 and stage2;
 ; it's also more secure than predefined /tmp subdir
 ; NB: a copy contained in ../../sbin/alteratord
 (define *tmpdir*
   (if (string=? *d-user* "root")
-      "/var/run/alteratord"
+      "/run/alteratord"
       (string-append
        (or (getenv "TMPDIR") "/tmp")
        "/alterator")))
diff --git a/alterator/man/alteratord.8 b/alterator/man/alteratord.8
index a997df9..07cb760 100644
--- a/alterator/man/alteratord.8
+++ b/alterator/man/alteratord.8
@@ -77,7 +77,7 @@ Directory for backends.
 \fI/usr/lib/alteratord/control\fR
 Helper utility to run \fBalteratord\fR on demand. This program is SUID root and is available to members of \fI_alteratord\fR group only.
 .TP
-\fI/var/run/alteratord/.socket\fR
+\fI/run/alteratord/.socket\fR
 Local domain socket to communicate with \fBalteratord\fR.
 .TP
 \fI/var/log/alteratord.log\fR
diff --git a/alterator/sbin/alteratord b/alterator/sbin/alteratord
index 1b45d5d..c7d1af9 100755
--- a/alterator/sbin/alteratord
+++ b/alterator/sbin/alteratord
@@ -52,13 +52,13 @@
 
 (define *d-user* (passwd:name (getpwuid (getuid))))
 
-; /var/run/alteratord is also used in installer
+; /run/alteratord is also used in installer
 ; to bounce the socket between stage3 and stage2;
 ; it's also more secure than predefined /tmp subdir
 ; NB: a copy contained in ../interfaces/guile/d.scm
 (define *tmpdir*
   (if (string=? *d-user* "root")
-    "/var/run/alteratord"
+    "/run/alteratord"
     (string-append
       (or (getenv "TMPDIR") "/tmp")
       "/alterator")))
diff --git a/alterator/systemd/system/alteratord.socket b/alterator/systemd/system/alteratord.socket
index fe482ba..d045e4a 100644
--- a/alterator/systemd/system/alteratord.socket
+++ b/alterator/systemd/system/alteratord.socket
@@ -3,7 +3,7 @@
 Description=Alterator backend server (socket)
 
 [Socket]
-ListenStream=/var/run/alteratord/.socket
+ListenStream=/run/alteratord/.socket
 
 [Install]
 WantedBy=sockets.target