diff --git a/src/mount-setup.c b/src/mount-setup.c
index 5cbaee6be7e..f08eeb162ea 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -54,6 +54,7 @@ static const MountPoint mount_table[] = {
         { "devtmpfs", "/dev",                   "devtmpfs", "mode=755",          MS_NOSUID,                    true },
         { "tmpfs",    "/dev/shm",               "tmpfs",    "mode=1777",         MS_NOSUID|MS_NODEV,           true },
         { "devpts",   "/dev/pts",               "devpts",   "mode=620,gid=" STRINGIFY(TTY_GID), MS_NOSUID|MS_NOEXEC, false },
+        { "tmpfs",    "/dev/.run",              "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "tmpfs",    "/sys/fs/cgroup",         "tmpfs",    "mode=755",          MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
         { "cgroup",   "/sys/fs/cgroup/systemd", "cgroup",   "none,name=systemd", MS_NOSUID|MS_NOEXEC|MS_NODEV, true },
 };
diff --git a/units/var-run.mount b/units/var-run.mount
index 8ccb4bb28e9..cd3889ebced 100644
--- a/units/var-run.mount
+++ b/units/var-run.mount
@@ -10,7 +10,7 @@ Description=Runtime Directory
 Before=local-fs.target
 
 [Mount]
-What=tmpfs
+What=/dev/.run
 Where=/var/run
-Type=tmpfs
-Options=mode=755,nosuid,nodev,noexec
+Type=bind
+Options=bind