diff --git a/evolution.spec b/evolution.spec
index 7cd7249..5a27392 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -25,6 +25,7 @@
 %define nntp_support 1
 %define exchange_support 1
 %define nm_support 1
+%define libnotify_support 1
 
 %define redhat_menus_version 5.0.4
 
@@ -32,7 +33,7 @@
 
 Name: evolution
 Version: 2.5.4
-Release: 3
+Release: 4
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -91,6 +92,7 @@ Patch803: evolution-2.5.2-no-gnome-common.patch
 
 Patch804: evolution-2.4.1-fix-missing-declarations.patch
 Patch805: evolution-2.5.4-fix-missing-declarations.patch
+Patch806: evolution-2.5.4-port-to-new-libnotify-api.patch
 
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
@@ -111,6 +113,11 @@ Requires: dbus >= %{dbus_version}
 Requires: libgnomeprint22 >= %{libgnomeprint22_version}
 Requires: gnome-vfs2 >= %{gnomevfs2_version}
 
+%if %{libnotify_support}
+Requires: libnotify
+Requires: notify-daemon
+%endif
+
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
@@ -169,6 +176,11 @@ BuildRequires: krb5-devel
 BuildRequires: NetworkManager-glib-devel
 %endif
 
+%if %{libnotify_support}
+BuildRequires: libnotify
+#ought to eventually be libnotify-devel, see bug 177484
+%endif
+
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
 communications tool.  The tools which make up Evolution will
@@ -223,6 +235,7 @@ cd ../..
 %patch803 -p1 -b .no-gnome-common
 %patch804 -p1 -b .fix-missing-declarations
 %patch805 -p1 -b .fix-missing-declarations-2-5-4
+%patch806 -p1 -b .port-to-new-libnotify-api
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -499,6 +512,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Wed Jan 11 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-4
+- ported alarm notification code to the new libnotify API (patch 806, #177546)
+- added libnotify_support macro
+- added explicit notify-daemon requirement as a workaround for bug #177535
+
 * Tue Jan 10 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-3
 - updated patch 800 to include patch for memo conduit (untested at this stage);
   renaming from evolution-2.5.2-fix-conduits.patch to