diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 8566537..ee4365b 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -1,4 +1,4 @@
-%define use_mozilla_nss 1
+%define use_nss 1
 %define ldap_support 1
 %define static_ldap 0
 %define krb5_support 1
@@ -20,7 +20,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.3
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -56,9 +56,9 @@ BuildRequires: ORBit2-devel >= %{orbit2_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
-%if %{use_mozilla_nss}
+%if %{use_nss}
 BuildRequires: nspr-devel
-BuildRequires: mozilla-nss-devel
+BuildRequires: nss-devel
 %else
 BuildRequires: openssl-devel
 %endif
@@ -143,22 +143,22 @@ mkdir -p krb5-fakeprefix/%{_lib}
 %define nntp_flags --enable-nntp=no
 %endif
 
-%if %{use_mozilla_nss}
+%if %{use_nss}
 %define ssl_flags --enable-nss=yes --enable-smime=yes
 %else
 %define ssl_flags --enable-openssl=yes
 %endif
 
-%if %{use_mozilla_nss}
-if ! pkg-config --exists mozilla-nss; then 
-  echo "Unable to find suitable version of mozilla nss to use!"
+%if %{use_nss}
+if ! pkg-config --exists nss; then 
+  echo "Unable to find suitable version of nss to use!"
   exit 1
 fi
 %endif
 
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"; export CFLAGS
-%if ! %{use_mozilla_nss}
+%if ! %{use_nss}
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
 	LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
@@ -228,6 +228,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 19 2005 David Malcolm <dmalcolm@redhat.com> - 1.5.3-2
+- Update specfile and patch 5 (evolution-data-server-1.3.5-nspr_fix.patch) to
+  use nss rather than mozilla-nss throughout
+
 * Mon Dec 19 2005 David Malcolm <dmalcolm@redhat.com> - 1.5.3-1
 - 1.5.3