diff --git a/CHANGELOG.md b/CHANGELOG.md
index e15046c..060737b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-
 [//]: # (Copyright 2019-2020 Rodolphe Bréard <rodolphe@breard.tf>)
 
 [//]: # (Copying and distribution of this file, with or without modification,)
@@ -21,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - The default account directory now is `/var/lib/acmed/accounts`.
 - The default certificates and private keys directory now is `/var/lib/acmed/certs`.
+- The default for volatile runtime data now is `/run`.
 
 
 ## [0.16.0] - 2020-11-11
diff --git a/Makefile b/Makefile
index 739044c..c4ddf9d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ MAN5DIR = $(DATADIR)/man/man5
 MAN8DIR = $(DATADIR)/man/man8
 SYSCONFDIR = /etc
 VARLIBDIR = /var/lib
-RUNSTATEDIR = /var/run
+RUNSTATEDIR = /run
 TARGET_DIR = ./target/$(TARGET)/release
 MAN_SRC_DIR = ./man/en
 MAN_DST_DIR = $(TARGET_DIR)/man
diff --git a/acmed/build.rs b/acmed/build.rs
index 188c993..72db5d4 100644
--- a/acmed/build.rs
+++ b/acmed/build.rs
@@ -48,7 +48,7 @@ macro_rules! set_cfg_path_if_absent {
 
 macro_rules! set_runstate_path_if_absent {
     ($name: expr, $default_value: expr) => {{
-        set_specific_path_if_absent!("RUNSTATEDIR", "/var/run", false, $name, $default_value);
+        set_specific_path_if_absent!("RUNSTATEDIR", "/run", false, $name, $default_value);
     }};
 }
 
diff --git a/tacd/build.rs b/tacd/build.rs
index d27e56c..c9f0947 100644
--- a/tacd/build.rs
+++ b/tacd/build.rs
@@ -27,7 +27,7 @@ macro_rules! set_specific_path_if_absent {
 
 macro_rules! set_runstate_path_if_absent {
     ($name: expr, $default_value: expr) => {{
-        set_specific_path_if_absent!("RUNSTATEDIR", "/var/run", $name, $default_value);
+        set_specific_path_if_absent!("RUNSTATEDIR", "/run", $name, $default_value);
     }};
 }