diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 161b69d..8b7ef99 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -5,6 +5,7 @@ ExcludeArch: ppc64
 
 %define use_mozilla_nss 1
 %define ldap_support 1
+%define static_ldap 1
 %define krb5_support 1
 %define nntp_support 1
 
@@ -24,7 +25,7 @@ ExcludeArch: ppc64
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.3.8
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -73,8 +74,12 @@ BuildRequires: gtk-doc
 
 
 %if %{ldap_support}
+%if %{static_ldap}
+BuildRequires: openldap-evolution-devel
+%else
 BuildRequires: openldap-devel >= 2.0.11 
 %endif
+%endif
 
 %if %{krb5_support} 
 BuildRequires: krb5-devel 
@@ -122,7 +127,13 @@ mkdir -p krb5-fakeprefix/%{_lib}
 
 %build
 %if %{ldap_support}
+
+%if %{static_ldap}
+%define ldap_flags --with-openldap=%{_libdir}/evolution-openldap --with-static-ldap
+%else
 %define ldap_flags --with-openldap=yes
+%endif
+
 %else
 %define ldap_flags --without-openldap
 %endif
@@ -153,7 +164,7 @@ fi
 %endif
 
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et -Werror-implicit-function-declaration"; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et"; export CFLAGS
 %if ! %{use_mozilla_nss}
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@@ -217,6 +228,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 24 2005 David Malcolm <dmalcolm@redhat.com> - 1.3.8-4
+- Remove -Werror-implicit-function-declaration from CFLAGS; this broke the
+  configuration test for fast mutexes in the internal copy of libdb, and hence
+  broke access to local addressbooks (#166742)
+- Introduce static_ldap macro; use it to link to static evolution-openldap 
+  library, containing NTLM support for LDAP binds (needed by Exchange support)
+
 * Tue Aug 23 2005 David Malcolm <dmalcolm@redhat.com> - 1.3.8-3
 - Updated patch 102 to fix further implicit function declarations