diff --git a/src/Makefile.am b/src/Makefile.am
index 6626659113017ce437615a54400e1774fc067522..f5093b9c90f63ce0ea4f5baa603d596d9fab6cc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,7 +93,7 @@ DRIVER_SOURCES =
 man7_MANS =
 
 COMMON_UNIT_VARS = \
-	-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	-e 's|[@]runstatedir[@]|$(runstatedir)|g' \
 	-e 's|[@]sbindir[@]|$(sbindir)|g' \
 	-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	$(NULL)
diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
index cd7072238c6bd8118f60c573596970e5abf8f1ba..c66e0f9693dc1e298735331ee2e1889b1fc83867 100644
--- a/src/locking/virtlockd-admin.socket.in
+++ b/src/locking/virtlockd-admin.socket.in
@@ -5,7 +5,7 @@ BindsTo=virtlockd.socket
 After=virtlockd.socket
 
 [Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
+ListenStream=@runstatedir@/libvirt/virtlockd-admin-sock
 Service=virtlockd.service
 SocketMode=0600
 
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
index d701b27516a279ef4c031fcdbf17a450bdabb45a..52014f45ec17e135d884bfc109b4d53eceee6d01 100644
--- a/src/locking/virtlockd.socket.in
+++ b/src/locking/virtlockd.socket.in
@@ -3,7 +3,7 @@ Description=Virtual machine lock manager socket
 Before=libvirtd.service
 
 [Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
+ListenStream=@runstatedir@/libvirt/virtlockd-sock
 SocketMode=0600
 
 [Install]
diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-admin.socket.in
index 672bd7470d2e5dd4a43e99fd7ee45323d4822c83..5c0fb1880ec4893737e423ab445c13d87559afff 100644
--- a/src/logging/virtlogd-admin.socket.in
+++ b/src/logging/virtlogd-admin.socket.in
@@ -5,7 +5,7 @@ BindsTo=virtlogd.socket
 After=virtlogd.socket
 
 [Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlogd-admin-sock
+ListenStream=@runstatedir@/libvirt/virtlogd-admin-sock
 Service=virtlogd.service
 SocketMode=0600
 
diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in
index ae48cdab9aed119f0a2d6959b0f7581513e8088d..9749a33197e98304f854e8bdc02e55ccc0038109 100644
--- a/src/logging/virtlogd.socket.in
+++ b/src/logging/virtlogd.socket.in
@@ -3,7 +3,7 @@ Description=Virtual machine log manager socket
 Before=libvirtd.service
 
 [Socket]
-ListenStream=@localstatedir@/run/libvirt/virtlogd-sock
+ListenStream=@runstatedir@/libvirt/virtlogd-sock
 SocketMode=0600
 
 [Install]
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index aca0b401401b642c6601978e4b8a17db5c8aff7a..abf04d998a64917b9005c0681e1d4282fa9441e7 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -247,6 +247,7 @@ remote/libvirtd.conf: remote/libvirtd.conf.in
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
 		-e '/[@]END[@]/d' \
 		-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
+		-e 's|[@]runstatedir[@]|@runstatedir@|' \
 		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
 		$< > $@
 
@@ -254,6 +255,7 @@ remote/virtproxyd.conf: remote/libvirtd.conf.in
 	$(AM_V_GEN)sed \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
 		-e '/[@]END[@]/d' \
+		-e 's|[@]runstatedir[@]|@runstatedir@|' \
 		-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
 		$< > $@
 
@@ -290,6 +292,7 @@ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
 		-e '/[@]END[@]/d' \
 		-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
+		-e 's|[@]runstatedir[@]|@runstatedir@|' \
 		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
 		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
 		> $@ || rm -f $@
@@ -301,6 +304,7 @@ remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \
 		$(SED) \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
 		-e '/[@]END[@]/d' \
+		-e 's|[@]runstatedir[@]|@runstatedir@|' \
 		-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
 		-e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
 		> $@ || rm -f $@
diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admin.socket.in
index dcce7fdc93efeb51fa72011a5582b4f82fc4ad60..4129abc1ab78fa44e35c948aea7db302217d5ff9 100644
--- a/src/remote/libvirtd-admin.socket.in
+++ b/src/remote/libvirtd-admin.socket.in
@@ -8,7 +8,7 @@ After=@service@.socket
 [Socket]
 # The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting
 # when using systemd version < 227
-ListenStream=@localstatedir@/run/libvirt/@sockprefix@-admin-sock
+ListenStream=@runstatedir@/libvirt/@sockprefix@-admin-sock
 Service=@service@.service
 SocketMode=0600
 
diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.socket.in
index a287f782018bd2514d17948a0679f599aabcd02f..cb5e6bd60f4e7cb6911ec5b3f3caadf5cf8fe01e 100644
--- a/src/remote/libvirtd-ro.socket.in
+++ b/src/remote/libvirtd-ro.socket.in
@@ -8,7 +8,7 @@ After=@service@.socket
 [Socket]
 # The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting
 # when using systemd version < 227
-ListenStream=@localstatedir@/run/libvirt/@sockprefix@-sock-ro
+ListenStream=@runstatedir@/libvirt/@sockprefix@-sock-ro
 Service=@service@.service
 SocketMode=0666
 
diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in
index 696999830642f0db0a1d51671acb78e4f09a312e..fdef97f371ee722d84e85a0f1e7339f42a3c18e1 100644
--- a/src/remote/libvirtd.conf.in
+++ b/src/remote/libvirtd.conf.in
@@ -119,7 +119,7 @@
 # This setting is not required or honoured if using systemd socket
 # activation with systemd version >= 227
 #
-#unix_sock_dir = "/var/run/libvirt"
+#unix_sock_dir = "@runstatedir@/libvirt"
 
 
 
diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in
index cb61409e232584dde373b52d8bfdb9a3d9b5098a..df36df212530c236b2797598a60bbdc345565abe 100644
--- a/src/remote/libvirtd.socket.in
+++ b/src/remote/libvirtd.socket.in
@@ -6,7 +6,7 @@ Before=@service@.service
 [Socket]
 # The directory must match the @sysconfdir@/libvirt/@service@.conf unix_sock_dir setting
 # when using systemd version < 227
-ListenStream=@localstatedir@/run/libvirt/@sockprefix@-sock
+ListenStream=@runstatedir@/libvirt/@sockprefix@-sock
 Service=@service@.service
 SocketMode=0666
 
diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug.in
index fc9fb69b6700311690423c2bdaae5c669ae0726d..1e17397af6734a0cbbb308ad106581e54197516d 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -13,7 +13,7 @@ module Test_@DAEMON_NAME@ =
         { "unix_sock_ro_perms" = "0777" }
         { "unix_sock_rw_perms" = "0770" }
         { "unix_sock_admin_perms" = "0700" }
-        { "unix_sock_dir" = "/var/run/libvirt" }
+        { "unix_sock_dir" = "@runstatedir@/libvirt" }
         { "auth_unix_ro" = "none" }
         { "auth_unix_rw" = "none" }
 @CUT_ENABLE_IP@