diff --git a/.cvsignore b/.cvsignore
index e886f5f..df418c6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-2.25.3.tar.bz2
+evolution-data-server-2.25.4.tar.bz2
diff --git a/evolution-data-server-2.25.3-implicit-function-declarations.patch b/evolution-data-server-2.25.3-implicit-function-declarations.patch
deleted file mode 100644
index b3cf4c7..0000000
--- a/evolution-data-server-2.25.3-implicit-function-declarations.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up evolution-data-server-2.25.3/camel/camel-folder-summary.c.implicit-function-declarations evolution-data-server-2.25.3/camel/camel-folder-summary.c
---- evolution-data-server-2.25.3/camel/camel-folder-summary.c.implicit-function-declarations	2008-12-15 10:23:02.000000000 -0500
-+++ evolution-data-server-2.25.3/camel/camel-folder-summary.c	2008-12-15 10:27:31.000000000 -0500
-@@ -41,6 +41,7 @@
- #include <libedataserver/e-memory.h>
- 
- #include "camel-db.h"
-+#include "camel-debug.h"
- #include "camel-file-utils.h"
- #include "camel-folder-summary.h"
- #include "camel-folder.h"
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 9de91dd..42e8cf0 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -9,7 +9,7 @@
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
 %define libbonobo_version 2.20.3
-%define libgweather_version 2.25.2
+%define libgweather_version 2.25.4
 %define orbit2_version 2.9.8
 %define soup_version 2.3.0
 %define sqlite_version 3.5
@@ -29,7 +29,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.25.3
+Version: 2.25.4
 Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
@@ -55,8 +55,6 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-Patch14: evolution-data-server-2.25.3-implicit-function-declarations.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -137,7 +135,6 @@ This package contains developer documentation for %{name}.
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
-%patch14 -p1 -b .implicit-function-declarations
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -383,6 +380,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jan 05 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.4-1.fc11
+- Update to 2.25.4
+
 * Mon Dec 15 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.3-1.fc11
 - Update to 2.25.3
 - New BR: libgweather-devel
diff --git a/sources b/sources
index 6435b0a..b75d58f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dc7d405f18c58a3a8c74f96a88fe0f7  evolution-data-server-2.25.3.tar.bz2
+714baf1349f75b8a94b7dc0a8e594781  evolution-data-server-2.25.4.tar.bz2