diff --git a/.gitignore b/.gitignore
index e61f20c..fccd49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /openldap-2.4.36.tgz
 /openldap-2.4.37.tgz
 /openldap-2.4.38.tgz
+/openldap-2.4.39.tgz
diff --git a/openldap-nss-pk11-freeslot.patch b/openldap-nss-pk11-freeslot.patch
index 9ac541d..ca657c8 100644
--- a/openldap-nss-pk11-freeslot.patch
+++ b/openldap-nss-pk11-freeslot.patch
@@ -1,27 +1,23 @@
 Resolves: #929357
 
-From 6330d1b87a45b447f33fe8ffd6fbbce9e60bb0ec Mon Sep 17 00:00:00 2001
-From: Rich Megginson <rmeggins@redhat.com>
+Upstream commit: 6330d1b87a45b447f33fe8ffd6fbbce9e60bb0ec
+Author: Rich Megginson <rmeggins@redhat.com>
 Date: Thu, 28 Mar 2013 19:05:02 -0600
-Subject: [PATCH] must call PK11_FreeSlot after SECMOD_CloseUserDB to remove ref to slot
+Modified by: Jan Synacek <jsynacek@redhat.com>
 
----
- libraries/libldap/tls_m.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+This patch has been re-diffed so it clearly applies to OpenLDAP 2.4.39.
 
 diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
 index 072d41d..c59d303 100644
 --- a/libraries/libldap/tls_m.c
 +++ b/libraries/libldap/tls_m.c
-@@ -2063,6 +2063,8 @@ tlsm_ctx_free ( tls_ctx *ctx )
+@@ -2151,6 +2151,8 @@
  				   "TLS: could not close certdb slot - error %d:%s.\n",
  				   errcode, PR_ErrorToString( errcode, PR_LANGUAGE_I_DEFAULT ), 0 );
  		}
 +		PK11_FreeSlot( c->tc_certdb_slot );
 +		c->tc_certdb_slot = NULL;
  	}
- 	PL_strfree( c->tc_pin_file );
- 	c->tc_pin_file = NULL;
--- 
-1.7.1
+ 	if ( c->tc_pin_file ) {
+ 		PL_strfree( c->tc_pin_file );
 
diff --git a/openldap.spec b/openldap.spec
index 6214980..1350e0a 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -4,7 +4,7 @@
 %global check_password_version 1.1
 
 Name: openldap
-Version: 2.4.38
+Version: 2.4.39
 Release: 1%{?dist}
 Summary: LDAP support libraries
 Group: System Environment/Daemons
@@ -599,6 +599,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 29 2014 Jan Synáček <jsynacek@redhat.com> - 2.4.39-1
+- new upstream release (#1059186)
+
 * Mon Nov 18 2013 Jan Synáček <jsynacek@redhat.com> - 2.4.38-1
 - new upstream release (#1031608)
 
diff --git a/sources b/sources
index 4bcc46f..af3adf2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-39831848c731bcaef235a04e0d14412f  openldap-2.4.38.tgz
+b0d5ee4b252c841dec6b332d679cf943  openldap-2.4.39.tgz
 3535b7cd46dcf41c9a9480efa9e64618  ltb-project-openldap-ppolicy-check-password-1.1.tar.gz