diff --git a/evolution.spec b/evolution.spec
index 67cfeed..ef35aaf 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -24,6 +24,7 @@
 # note that nntp is non-functional in evo 1.3.x
 %define nntp_support 1
 %define exchange_support 1
+%define nm_support 1
 
 %define redhat_menus_version 5.0.4
 
@@ -31,7 +32,7 @@
 
 Name: evolution
 Version: 2.5.4
-Release: 1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -164,6 +165,10 @@ BuildRequires: krb5-devel
 #define krb5dir `pwd`/krb5-fakeprefix
 %endif
 
+%if %{nm_support}
+BuildRequires: NetworkManager-glib-devel
+%endif
+
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
 communications tool.  The tools which make up Evolution will
@@ -494,6 +499,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Wed Jan  4 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-2
+- added optional build-time requirement on NetworkManager-glib-devel
+- update patch 805 to cover a missing declaration in Network Manager support
+
 * Tue Jan  3 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-1
 - 2.5.4
 - update patch 107 to track underlying code changes; rename from