diff --git a/saslauthd.service b/saslauthd.service
index 2a36f30..1dca862 100644
--- a/saslauthd.service
+++ b/saslauthd.service
@@ -4,9 +4,9 @@ After=syslog.target
 
 [Service]
 Type=forking
-PIDFile=/etc/sysconfig/saslauthd
+PIDFile=/run/saslauthd/saslauthd.pid
 EnvironmentFile=/etc/sysconfig/saslauthd
-ExecStart=/usr/sbin/saslauthd -a $MECH $FLAGS
+ExecStart=/usr/sbin/saslauthd -m $SOCKETDIR -a $MECH $FLAGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/saslauthd.sysconfig b/saslauthd.sysconfig
index 71a7de5..a3da376 100644
--- a/saslauthd.sysconfig
+++ b/saslauthd.sysconfig
@@ -1,6 +1,6 @@
 # Directory in which to place saslauthd's listening socket, pid file, and so
 # on.  This directory must already exist.
-SOCKETDIR=/var/run/saslauthd
+SOCKETDIR=/run/saslauthd
 
 # Mechanism to use when checking passwords.  Run "saslauthd -v" to get a list
 # of which mechanism your installation was compiled with the ablity to use.
diff --git a/saslauthd.tmpfiles b/saslauthd.tmpfiles
index 6fdb5d3..d4809f7 100644
--- a/saslauthd.tmpfiles
+++ b/saslauthd.tmpfiles
@@ -1 +1 @@
-d /var/run/saslauthd 0755 root root -
+d /run/saslauthd 0755 root root -