diff --git a/evolution.spec b/evolution.spec
index a3701aa..06ba845 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -12,10 +12,15 @@ ExcludeArch: ppc64
 %define gnome_icon_theme_version 1.3.6
 %define libgnomeprint22_version 2.8.0
 
+##########################################################
+# The Mozilla NSS API/ABI stabilised by version 1.7.3
+# The libraries are always located in the libdir, and a dependency on them will be autogenerated.
+# However, the headers are in /usr/include/mozilla-%{mozilla_build_version} and so they move each time the mozilla version changes.
+# We use this macro to locate the headers:
 %if %{use_mozilla_nss}
-%define mozilla_version 1.7.6
+%define mozilla_build_version 1.7.6
 %endif
-# end of use_mozilla_nss conditional section
+##########################################################
 
 %define ldap_support 1
 %define krb5_support 1
@@ -29,7 +34,7 @@ ExcludeArch: ppc64
 
 Name: evolution
 Version: 2.2.0
-Release: 4
+Release: 5
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -52,6 +57,9 @@ Patch101: evo-calendar-print-with-pango-4.patch
 # patch from upstream:
 Patch102: evolution-2.2.0-XB73192.patch
 
+
+Patch103: evolution-2.2.0-fix-for-dbus31.patch
+
 # not accepted, but proposed on a few occasions.  fixes problems with
 # some cyrus servers
 #Patch200: evolution-1.4.5-imap-command-length.patch
@@ -68,12 +76,6 @@ Group: Applications/Productivity
 
 Requires: scrollkeeper >= 0.1.4
 Requires: ORBit2 >= 2.7.5
-
-%if %{use_mozilla_nss}
-Requires: mozilla-nss >= 37:%{mozilla_version}
-Requires: mozilla-nspr >= 37:%{mozilla_version}
-%endif
-
 Requires: libsoup >= %{soup_version}
 Requires: libgal2 >= %{gal_version}
 Requires: evolution-data-server >= %{eds_version}
@@ -109,8 +111,8 @@ BuildRequires: dbus-devel
 BuildRequires: gtk-doc
 
 %if %{use_mozilla_nss}
-BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_version}
-BuildRequires: mozilla-nss-devel >= 37:%{mozilla_version}
+BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_build_version}
+BuildRequires: mozilla-nss-devel >= 37:%{mozilla_build_version}
 %else
 BuildRequires: openssl-devel
 %endif
@@ -177,6 +179,8 @@ cd mail
 %patch102 -p0 -b .XB-73912
 cd ..
 
+%patch103 -p1 -b .fix-for-dbus31
+
 #patch200 -p1 -b .commandlength
 
 #patch500 -p0 -b .wombatsm
@@ -214,13 +218,13 @@ mkdir -p krb5-fakeprefix/%{_lib}
 %endif
 
 %if %{use_mozilla_nss}
-%define ssl_flags --with-nspr-includes=/usr/include/mozilla-%{mozilla_version}/nspr --with-nspr-libs=%{_libdir} --with-nss-includes=/usr/include/mozilla-%{mozilla_version}/nss --with-nss-libs=%{_libdir}
+%define ssl_flags --with-nspr-includes=/usr/include/mozilla-%{mozilla_build_version}/nspr --with-nspr-libs=%{_libdir} --with-nss-includes=/usr/include/mozilla-%{mozilla_build_version}/nss --with-nss-libs=%{_libdir}
 %else
 %define ssl_flags --enable-openssl=yes
 %endif
 
 %if %{use_mozilla_nss}
-if [ ! -f /usr/include/mozilla-%{mozilla_version}/nspr/nspr.h ]; then
+if [ ! -f /usr/include/mozilla-%{mozilla_build_version}/nspr/nspr.h ]; then
   echo "Unable to find suitable version of mozilla nss to use!"
   exit 1
 fi
@@ -335,6 +339,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Thu Mar 10 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-5
+- Added patch for changes to DBus API in version 0.31 (#150671)
+- Removed explicit run-time spec-file requirement on mozilla.
+  The Mozilla NSS API/ABI stabilised by version 1.7.3
+  The libraries are always located in the libdir
+  However, the headers are in /usr/include/mozilla-%{mozilla_build_version}
+  and so they move each time the mozilla version changes.
+  So we no longer have an explicit mozilla run-time requirement in the specfile; 
+  a requirement on the appropriate NSS and NSPR .so files is automagically generated on build.
+  We have an explicit, exact build-time version, so that we can find the headers (without
+  invoking an RPM query from the spec file; to do so is considered bad practice)
+- Introduced mozilla_build_version, to replace mozilla_version
+
 * Wed Mar  9 2005 Christopher Aillon <caillon@redhat.com> - 2.2.0-4
 - Depend on mozilla 1.7.6