diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 86c681b..f4e519a 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,6 +1,6 @@
 %define use_nss 1
 %define ldap_support 1
-%define static_ldap 0
+%define static_ldap 1
 %define krb5_support 1
 %define nntp_support 1
 
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -184,6 +184,13 @@ mkdir -p krb5-fakeprefix/%{_lib}
 
 %if %{static_ldap}
 %define ldap_flags --with-openldap=%{_libdir}/evolution-openldap --with-static-ldap
+# Set LIBS so that configure will be able to link with static LDAP libraries,
+# which depend on Cyrus SASL and OpenSSL.
+if pkg-config openssl ; then
+	export LIBS="-lsasl2 `pkg-config --libs openssl`"
+else
+	export LIBS="-lsasl2 -lssl -lcrypto"
+fi
 %else
 %define ldap_flags --with-openldap=yes
 %endif
@@ -223,8 +230,8 @@ fi
 %define imap4_flags --enable-imap4=no
 %endif
 
-CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"; export CFLAGS
+export CPPFLAGS="-I%{_includedir}/et"
+export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
 %if ! %{use_nss}
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@@ -251,6 +258,7 @@ CFLAGS="$CFLAGS \
         -DPANGO_DISABLE_DEPRECATED=1 \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
+	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration"
 %endif
 
@@ -260,7 +268,8 @@ CFLAGS="$CFLAGS \
 %configure \
 	%gtkdoc_flags \
 	--with-libdb=/usr \
-	--enable-file-locking=fcntl --enable-dot-locking=no \
+	--enable-file-locking=fcntl \
+	--enable-dot-locking=no \
 	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
@@ -382,6 +391,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Mar 27 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-4.fc7
+- Link to static evolution-openldap library (RH bug #210126).
+- Add -Wdeclaration-after-statement to strict build settings.
+
 * Thu Mar 22 2007 Matthew Barnes <mbarnes@redhat.com> - 1.10.0-3.fc7
 - Stop beeping at me!