diff --git a/.cvsignore b/.cvsignore
index 7612055..d24f5cc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ openldap-2.3.27.tgz
 openldap-2.3.28.tgz
 openldap-2.3.30.tgz
 openldap-2.3.34.tgz
+openldap-2.3.37.tgz
diff --git a/openldap-2.3.34-smbk5pwd.patch b/openldap-2.3.37-smbk5pwd.patch
similarity index 79%
rename from openldap-2.3.34-smbk5pwd.patch
rename to openldap-2.3.37-smbk5pwd.patch
index 7f5b6cb..95f9c27 100644
--- a/openldap-2.3.34-smbk5pwd.patch
+++ b/openldap-2.3.37-smbk5pwd.patch
@@ -1,16 +1,27 @@
---- openldap-2.3.34/servers/slapd/overlays/Makefile.in.smbk5pwd	2007-01-02 22:44:08.000000000 +0100
-+++ openldap-2.3.34/servers/slapd/overlays/Makefile.in	2007-06-29 16:59:32.000000000 +0200
-@@ -28,7 +28,8 @@
+--- openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README.smbk5pwd	2005-11-14 19:06:04.000000000 +0100
++++ openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README	2007-07-09 09:44:43.000000000 +0200
+@@ -1,3 +1,8 @@
++***************************************************************
++Red Hat note: Kerberos support is NOT compiled into
++this version of smbk5pwd because we do not use Heimdall.
++***************************************************************
++
+ Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+--- openldap-2.3.37/servers/slapd/overlays/Makefile.in.orig	2007-05-29 23:57:47.000000000 +0200
++++ openldap-2.3.37/servers/slapd/overlays/Makefile.in	2007-07-31 16:27:08.000000000 +0200
+@@ -28,7 +28,8 @@ SRCS = overlays.c \
  	syncprov.c \
  	translucent.c \
  	unique.c \
 -	valsort.c
 +	valsort.c \
 +	smbk5pwd.c
- OBJS = overlays.o \
- 	statover.o \
- 	@SLAPD_STATIC_OVERLAYS@
-@@ -41,14 +42,14 @@
+ OBJS = statover.o \
+ 	@SLAPD_STATIC_OVERLAYS@ \
+ 	overlays.o
+@@ -41,14 +42,14 @@ LTONLY_MOD = $(LTONLY_mod)
  LDAP_INCDIR= ../../../include       
  LDAP_LIBDIR= ../../../libraries
  
@@ -27,7 +38,7 @@
  
  XINCPATH = -I.. -I$(srcdir)/..
  XDEFS = $(MODULES_CPPFLAGS)
-@@ -105,6 +106,9 @@
+@@ -105,6 +106,9 @@ unique.la : unique.lo
  valsort.la : valsort.lo
  	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
  
@@ -37,14 +48,3 @@
  install-local:	$(PROGRAMS)
  	@if test -n "$?" ; then \
  		$(MKDIR) $(DESTDIR)$(moduledir); \
---- openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README.smbk5pwd	2005-11-14 19:06:04.000000000 +0100
-+++ openldap-2.3.34/contrib/slapd-modules/smbk5pwd/README	2007-07-09 09:44:43.000000000 +0200
-@@ -1,3 +1,8 @@
-+***************************************************************
-+Red Hat note: Kerberos support is NOT compiled into
-+this version of smbk5pwd because we do not use Heimdall.
-+***************************************************************
-+
- Copyright 2004-2005 Howard Chu, Symas Corp. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
diff --git a/openldap.spec b/openldap.spec
index ff5a522..918e145 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -2,7 +2,7 @@
 %define db_version 4.4.20
 %define ldbm_backend berkeley
 %define version_22 2.2.29
-%define version_23 2.3.34
+%define version_23 2.3.37
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -42,7 +42,7 @@ Patch6: openldap-2.3.11-nosql.patch
 Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch9: openldap-2.3.34-quiet-slaptest.patch
 Patch10: openldap-2.3.34-pthread.patch
-Patch11: openldap-2.3.34-smbk5pwd.patch
+Patch11: openldap-2.3.37-smbk5pwd.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -747,6 +747,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Jul 31 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-1%{?dist}
+- new upstream version
+
 * Fri Jul 20 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-7%{?dist}
 - MigrationTools-47 integrated
 
diff --git a/sources b/sources
index 3c0e4fd..0640b76 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 3faf83eb8482e55979bda47f1d1e6501  MigrationTools-47.tar.gz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
-143eeb6e3c163e5f52d8e744b43a5960  openldap-2.3.34.tgz
+f5c6cec07469ce8f64710eba3aeb58f8  openldap-2.3.37.tgz