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 a4a6d2a..e1060f7 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,7 +5,7 @@
 
 Name: openldap
 Version: 2.4.39
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
 License: OpenLDAP
@@ -602,6 +602,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 30 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-3
+- fix: remove correct tmp file when generating server cert (#1103102)
+
 * Tue Feb  4 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-2
 - CVE-2013-4449: segfault on certain queries with rwm overlay (#1060851)