diff --git a/Makefile b/Makefile
index 2f081ad..6bf4610 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ install:
 	mkdir -p $(DESTDIR)/var/log/tuned
 
 	# runtime directory
-	mkdir -p $(DESTDIR)/var/run/tuned
+	mkdir -p $(DESTDIR)/run/tuned
 	mkdir -p $(DESTDIR)/etc/tmpfiles.d
 	install -m 0644 tuned.tmpfiles $(DESTDIR)/etc/tmpfiles.d/tuned.conf
 
diff --git a/profiles/functions b/profiles/functions
index d2fc9b4..3fef967 100644
--- a/profiles/functions
+++ b/profiles/functions
@@ -7,7 +7,7 @@
 #
 # Config
 #
-STORAGE=/var/run/tuned
+STORAGE=/run/tuned
 STORAGE_SUFFIX=".save"
 
 #
diff --git a/test/test_storage.py b/test/test_storage.py
index 7200ec4..38f9c46 100644
--- a/test/test_storage.py
+++ b/test/test_storage.py
@@ -53,7 +53,7 @@ class StoragePickleProviderTestCase(unittest.TestCase):
 		self.assertEqual(self._temp_filename, provider._path)
 
 		provider = tuned.storage.PickleProvider()
-		self.assertEqual("/var/run/tuned/save.pickle", provider._path)
+		self.assertEqual("/run/tuned/save.pickle", provider._path)
 
 	def test_memory_persistence(self):
 		provider = tuned.storage.PickleProvider(self._temp_filename)
diff --git a/tuned-adm.py b/tuned-adm.py
index c1b5aab..c208352 100755
--- a/tuned-adm.py
+++ b/tuned-adm.py
@@ -26,7 +26,7 @@ import sys
 import locale
 import signal
 
-PIDFILE = "/var/run/tuned/tuned.pid"
+PIDFILE = "/run/tuned/tuned.pid"
 
 def usage():
 	print """
diff --git a/tuned.service b/tuned.service
index 1aaa026..cf31cce 100644
--- a/tuned.service
+++ b/tuned.service
@@ -4,7 +4,7 @@ After=syslog.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/tuned/tuned.pid
+PIDFile=/run/tuned/tuned.pid
 BusName=com.redhat.tuned
 ExecStart=/usr/sbin/tuned -d
 
diff --git a/tuned.tmpfiles b/tuned.tmpfiles
index 2ea8731..0fa1ec2 100644
--- a/tuned.tmpfiles
+++ b/tuned.tmpfiles
@@ -1,2 +1,2 @@
 # tuned runtime directory
-d /var/run/tuned 0755 root root -
+d /run/tuned 0755 root root -
diff --git a/tuned/storage/pickle_provider.py b/tuned/storage/pickle_provider.py
index 6d06062..4dafd0d 100644
--- a/tuned/storage/pickle_provider.py
+++ b/tuned/storage/pickle_provider.py
@@ -5,7 +5,7 @@ import os
 
 log = tuned.logs.get()
 
-DEFAULT_STORAGE_FILE = "/var/run/tuned/save.pickle"
+DEFAULT_STORAGE_FILE = "/run/tuned/save.pickle"
 
 class PickleProvider(interfaces.Provider):
 	__slots__ = ["_path", "_data"]
diff --git a/tuned/utils/daemon.py b/tuned/utils/daemon.py
index ef0ac02..550666d 100644
--- a/tuned/utils/daemon.py
+++ b/tuned/utils/daemon.py
@@ -5,7 +5,7 @@ import os
 import signal
 import sys
 
-PIDFILE = "/var/run/tuned/tuned.pid"
+PIDFILE = "/run/tuned/tuned.pid"
 
 log = tuned.logs.get()