diff --git a/.cvsignore b/.cvsignore
index ce6666c..e415cd2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ db-4.4.20.tar.gz
 autoconf-2.13.1.tar.gz
 automake-1.4a.tar.gz
 openldap-2.3.24.tgz
+openldap-2.3.27.tgz
diff --git a/openldap.spec b/openldap.spec
index 8fda064..955cc24 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.24
+%define version_23 2.3.27
 %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: 2.1
+Release: 2
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -39,6 +39,7 @@ Patch4: openldap-2.2.13-pie.patch
 Patch5: openldap-2.3.11-toollinks.patch
 Patch6: openldap-2.3.11-nosql.patch
 #Patch7: openldap-2.3.19-nostrip.patch
+Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -172,6 +173,7 @@ pushd openldap-%{version_23}
 %patch5 -p1 -b .toollinks
 %patch6 -p1 -b .nosql
 #%patch7 -p1 -b .nostrip
+%patch8 -p1 -b .gethostbyname_r
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
 
@@ -689,6 +691,11 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Aug 25 2006 Jay Fenlason <fenlason@redhat.com> 2.3.27-2
+- New upstream release
+- Include the gethostbyname_r patch so that nss_ldap won't hang
+  on recursive attemts to ldap_initialize.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.3.24-2.1
 - rebuild
 
diff --git a/sources b/sources
index 3857e88..375f0c3 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 dc80548f76d6aeba2b51b15751e08b21  MigrationTools-46.tar.gz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
-3e58de30abc959ec88730123cecdb6d1  openldap-2.3.24.tgz
+0fbae4e9279aaa586adcd9f19b66a5ed  openldap-2.3.27.tgz