diff --git a/iscsi-scst/usr/iscsi_scstd.c b/iscsi-scst/usr/iscsi_scstd.c
index 60b83099f..99380c01e 100644
--- a/iscsi-scst/usr/iscsi_scstd.c
+++ b/iscsi-scst/usr/iscsi_scstd.c
@@ -979,7 +979,7 @@ int main(int argc, char **argv)
 		pid_t pid;
 		int fd;
 
-		fd = open("/var/run/iscsi-scstd.pid", O_WRONLY|O_CREAT, 0644);
+		fd = open("/run/iscsi-scstd.pid", O_WRONLY|O_CREAT, 0644);
 		if (fd < 0) {
 			log_error("unable to create pid file");
 			exit(1);
diff --git a/scstadmin/init.d/scst b/scstadmin/init.d/scst
index 9490e1b29..8b4497cb6 100755
--- a/scstadmin/init.d/scst
+++ b/scstadmin/init.d/scst
@@ -102,7 +102,7 @@ start_daemon() {
 killproc() {
     exe=$(basename "$1")
     killall "$exe"
-    rm -f "/var/run/$exe.pid"
+    rm -f "/run/$exe.pid"
 }
 fi
 
@@ -275,8 +275,8 @@ stop_scst() {
 scst_status() {
         # Status has a slightly different meaning for the status command:
         # 0 - service running
-        # 1 - service dead, but /var/run/  pid  file exists
-        # 2 - service dead, but /var/lock/ lock file exists
+        # 1 - service dead, but /run/  pid  file exists
+        # 2 - service dead, but /run/lock/ lock file exists
         # 3 - service not running
 
         parse_scst_conf