diff --git a/sssd.spec b/sssd.spec
index ab4fc00..c608738 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -36,7 +36,7 @@
 
 Name: sssd
 Version: 2.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: System Security Services Daemon
 License: GPLv3+
 URL: https://github.com/SSSD/sssd/
@@ -523,6 +523,7 @@ autoreconf -ivf
     --with-gpo-cache-path=%{gpocachepath} \
     --with-init-dir=%{_initrddir} \
     --with-krb5-rcache-dir=%{_localstatedir}/cache/krb5rcache \
+    --with-pid-path=%{_rundir} \
     --enable-nsslibdir=%{_libdir} \
     --enable-pammoddir=%{_libdir}/security \
     --enable-nfsidmaplibdir=%{_libdir}/libnfsidmap \
@@ -540,7 +541,7 @@ autoreconf -ivf
     %{?with_cifs_utils_plugin_option} \
     %{?enable_systemtap_opt}
 
-make %{?_smp_mflags} all docs
+make %{?_smp_mflags} all docs runstatedir=%{_rundir}
 
 sed -i -e 's:/usr/bin/python:/usr/bin/python3:' src/tools/sss_obfuscate
 
@@ -1073,6 +1074,9 @@ fi
                                 %{_libdir}/%{name}/modules/libwbclient.so
 
 %changelog
+* Mon Jul 27 2020 Pavel Březina <pbrezina@redhat.com> - 2.3.1-2
+- Use correct run dir (RHBZ#1557622)
+
 * Fri Jul 24 2020 Pavel Březina <pbrezina@redhat.com> - 2.3.1-1
 - Rebase to SSSD 2.3.1