diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 04d1b88..7b25719 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -8,7 +8,7 @@ ExcludeArch: ppc64
 %define krb5_support 1
 %define nntp_support 1
 
-%define soup_version 2.2.2
+%define soup_version 2.2.3
 %define orbit2_version 2.9.8
 %define libbonobo_version 2.4.2
 
@@ -20,20 +20,10 @@ ExcludeArch: ppc64
 %define use_gtk_doc 1
 %endif
 
-##########################################################
-# 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_build_version 1.7.6
-%endif
-##########################################################
-
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.2.2
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -65,8 +55,8 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 %if %{use_mozilla_nss}
-BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_build_version}
-BuildRequires: mozilla-nss-devel >= 37:%{mozilla_build_version}
+BuildRequires: mozilla-nspr-devel
+BuildRequires: mozilla-nss-devel
 %else
 BuildRequires: openssl-devel
 %endif
@@ -140,13 +130,13 @@ mkdir -p krb5-fakeprefix/%{_lib}
 %endif
 
 %if %{use_mozilla_nss}
-%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}
+%define ssl_flags --enable-nss=yes --enable-smime=yes
 %else
 %define ssl_flags --enable-openssl=yes
 %endif
 
 %if %{use_mozilla_nss}
-if [ ! -f /usr/include/mozilla-%{mozilla_build_version}/nspr/nspr.h ]; then
+if ! pkg-config --exists mozilla-nss; then 
   echo "Unable to find suitable version of mozilla nss to use!"
   exit 1
 fi
@@ -214,6 +204,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 18 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.2-3
+- bumped libsoup requirement to 2.2.3; removed mozilla_build_version, using
+  pkg-config instead for locating NSPRS and NSS headers/libraries (#158085)
+
 * Mon Apr 11 2005 David Malcolm <dmalcolm@redhat.com> - 1.2.2-2
 - added patch to calendar/libecal/e-cal.c to fix missing declaration of open_calendar