diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index aa73824..a924ef0 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -17,10 +17,15 @@
 %define use_gtk_doc 1
 %endif
 
+%define support_imap4_provider 0
+
+%define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers
+%define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions
+
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.4
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -42,6 +47,8 @@ Patch103: evolution-data-server-1.2.0-validatehelo.patch
 Patch200: gb-309079-attach-48376.patch
 Patch201: gb-309079-attach-48377.patch
 
+Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -115,6 +122,7 @@ evolution-data-server.
 %patch103 -p1 -b .validatehelo
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
+%patch300 -p1 -b .make-imap4-optional
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -158,6 +166,12 @@ if ! pkg-config --exists nss; then
 fi
 %endif
 
+%if %{support_imap4_provider}
+%define imap4_flags --enable-imap4=yes
+%else
+%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
 %if ! %{use_nss}
@@ -173,13 +187,21 @@ fi
 %define gtkdoc_flags --enable-gtk-doc=no
 %endif
 
+# Rerun automake since we patched some Makefile.am files:
+aclocal
+autoheader
+automake
+libtoolize
+intltoolize --force
+
 # Rerun autoconf since we patched configure.in:
 autoconf
 
+
 %configure \
   %gtkdoc_flags \
   --enable-file-locking=fcntl --enable-dot-locking=no \
-  %ldap_flags %krb5_flags %nntp_flags %ssl_flags
+  %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 
@@ -215,11 +237,49 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/idl/evolution-data-server-%{eds_api_version}
 %{_datadir}/pixmaps/evolution-data-server-%{eds_base_version}
 %dir %{_libdir}/evolution-data-server-%{eds_api_version}
-%dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/
-%dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions/
-%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.so
-%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.urls
-%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.so
+%dir %{camel_provider_dir}
+%dir %{eds_extensions_dir}
+
+# Camel providers:
+%{camel_provider_dir}/libcamelgroupwise.so
+%{camel_provider_dir}/libcamelgroupwise.urls
+
+%{camel_provider_dir}/libcamelhula.so
+%{camel_provider_dir}/libcamelhula.urls
+
+%{camel_provider_dir}/libcamelimap.so
+%{camel_provider_dir}/libcamelimap.urls
+
+%if %{support_imap4_provider}
+%{camel_provider_dir}/libcamelimap4.so
+%{camel_provider_dir}/libcamelimap4.urls
+%endif
+
+%{camel_provider_dir}/libcamellocal.so
+%{camel_provider_dir}/libcamellocal.urls
+
+%{camel_provider_dir}/libcamelnntp.so
+%{camel_provider_dir}/libcamelnntp.urls
+
+%{camel_provider_dir}/libcamelpop3.so
+%{camel_provider_dir}/libcamelpop3.urls
+
+%{camel_provider_dir}/libcamelsendmail.so
+%{camel_provider_dir}/libcamelsendmail.urls
+
+%{camel_provider_dir}/libcamelsmtp.so
+%{camel_provider_dir}/libcamelsmtp.urls
+
+# e-d-s extensions:
+%{eds_extensions_dir}/libebookbackendfile.so
+%{eds_extensions_dir}/libebookbackendgroupwise.so
+%{eds_extensions_dir}/libebookbackendldap.so
+%{eds_extensions_dir}/libebookbackendvcf.so
+%{eds_extensions_dir}/libecalbackendcontacts.so
+%{eds_extensions_dir}/libecalbackendfile.so
+%{eds_extensions_dir}/libecalbackendgroupwise.so
+%{eds_extensions_dir}/libecalbackendhttp.so
+%{eds_extensions_dir}/libecalbackendweather.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -230,6 +290,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan  9 2006 David Malcolm <dmalcolm@redhat.com> - 1.5.4-3
+- added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in 
+  our packages; re-run automake since we have touched various Makefile.am 
+  files; rerun intltoolize to avoid incompatibilities between tarball copy of
+  intltool-merge.in and intltool.m4 in intltool package (@EXPANDED_LIBDIR@
+  renamed to @INTLTOOL_LIBDIR@) (#167574)
+- explicitly list the camel providers and e-d-s extension files in the spec file
+
 * Thu Jan  5 2006 David Malcolm <dmalcolm@redhat.com> - 1.5.4-2
 - added patch from David Woodhouse to validate reverse DNS domain before using 
   in SMTP greeting (patch 103, #151121)