diff --git a/libexec-generate-server-cert.sh b/libexec-generate-server-cert.sh
index 1a66b8c..04a9174 100755
--- a/libexec-generate-server-cert.sh
+++ b/libexec-generate-server-cert.sh
@@ -102,7 +102,7 @@ certutil -d "$CERTDB_DIR" -f "$PASSWORD_FILE" -z "$CERT_RANDOM" \
 	-8 "$ALT_NAMES" \
 	&>/dev/null
 
-rm -f $RANDOM_DATA
+rm -f $CERT_RANDOM
 
 # tune permissions
 
diff --git a/openldap.spec b/openldap.spec
index 75a3a1e..bf924ea 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,7 +5,7 @@
 
 Name: openldap
 Version: 2.4.39
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -577,6 +577,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 30 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-6
+- fix: remove correct tmp file when generating server cert (#1103102)
+
 * Mon Mar 24 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-5
 - re-symlink unversioned libraries, so ldconfig is not confused (#1028557)