diff --git a/libexec-check-config.sh b/libexec-check-config.sh
index 0e6ade8..87e377f 100755
--- a/libexec-check-config.sh
+++ b/libexec-check-config.sh
@@ -6,7 +6,7 @@
 function check_config_syntax()
 {
 	retcode=0
-	tmp_slaptest=`mktemp`
+	tmp_slaptest=`mktemp --tmpdir=/var/run/openldap`
 	run_as_ldap "/usr/sbin/slaptest $SLAPD_GLOBAL_OPTIONS -u" &>$tmp_slaptest
 	if [ $? -ne 0 ]; then
 		error "Checking configuration file failed:"
diff --git a/libexec-convert-config.sh b/libexec-convert-config.sh
index 6d8414e..ca9884f 100755
--- a/libexec-convert-config.sh
+++ b/libexec-convert-config.sh
@@ -49,7 +49,7 @@ fi
 
 # perform the conversion
 
-tmp_convert=`mktemp`
+tmp_convert=`mktemp --tmpdir=/var/run/openldap`
 
 if [ `id -u` -eq 0 ]; then
 	install -d --owner $SLAPD_USER --group `id -g $SLAPD_USER` --mode 0700 "$SLAPD_CONFIG_DIR" &>>$tmp_convert
diff --git a/libexec-generate-server-cert.sh b/libexec-generate-server-cert.sh
index d77e3b8..1a66b8c 100755
--- a/libexec-generate-server-cert.sh
+++ b/libexec-generate-server-cert.sh
@@ -90,7 +90,7 @@ fi
 # generate server certificate (self signed)
 
 
-CERT_RANDOM=$(mktemp)
+CERT_RANDOM=$(mktemp --tmpdir=/var/run/openldap)
 dd if=$RANDOM_SOURCE bs=$CERT_RANDOM_BYTES count=1 of=$CERT_RANDOM &>/dev/null
 
 certutil -d "$CERTDB_DIR" -f "$PASSWORD_FILE" -z "$CERT_RANDOM" \
diff --git a/openldap.spec b/openldap.spec
index 39c6126..904331a 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -624,6 +624,7 @@ exit 0
   + backends: locking and memory management in MDB
   + manpages: slapo-refint
 - patch update: MozNSS certificate database in SQL format cannot be used (#860317)
+- fix: slapd.service should not use /tmp (#859019)
 
 * Fri Sep 14 2012 Jan Vcelak <jvcelak@redhat.com> 2.4.32-3
 - fix: some TLS ciphers cannot be enabled (#852338)