diff --git a/dist/systemd/zrepl.service b/dist/systemd/zrepl.service
index 9b3628d..d8b5767 100644
--- a/dist/systemd/zrepl.service
+++ b/dist/systemd/zrepl.service
@@ -4,8 +4,9 @@ Documentation=https://zrepl.github.io
 
 [Service]
 Type=simple
+ExecStartPre=/usr/local/bin/zrepl --config /etc/zrepl/zrepl.yml configcheck
 ExecStart=/usr/local/bin/zrepl --config /etc/zrepl/zrepl.yml daemon
-RuntimeDirectory=zrepl
+RuntimeDirectory=zrepl zrepl/stdinserver
 RuntimeDirectoryMode=0700
 
 ProtectSystem=strict