diff --git a/.cvsignore b/.cvsignore
index fa699c7..b660a84 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.25.4.tar.bz2
+evolution-2.25.5.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 8f880b4..b20bbe2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,6 +1,5 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.25.4
 %define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -45,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.25.4
+Version: 2.25.5
 Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
@@ -89,7 +88,7 @@ Requires(post): scrollkeeper >= %{scrollkeeper_version}
 Requires(postun): scrollkeeper >= %{scrollkeeper_version}
 
 # Don't trust evolution-data-server to maintain accurate sonames.
-Requires: evolution-data-server >= %{eds_version}
+Requires: evolution-data-server >= %{version}
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-themes
@@ -106,7 +105,7 @@ BuildRequires: byacc
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: desktop-file-utils
-BuildRequires: evolution-data-server-devel >= %{eds_version}
+BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -172,7 +171,7 @@ personal information-management tool.
 Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: evolution-data-server-devel >= %{eds_version}
+Requires: evolution-data-server-devel >= %{version}
 Requires: gtk2-devel >= %{gtk2_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libbonobo-devel >= %{libbonobo_version}
@@ -704,6 +703,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Jan 19 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.5-1.fc11
+- Update to 2.25.5
+- Ditch eds_version and use our own version.  This will keep evolution
+  and evolution-data-server versions in lockstep from now on.
+
 * Mon Jan 05 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.4-1.fc11
 - Update to 2.25.4
 - Bump eds_version to 2.25.4.
diff --git a/sources b/sources
index 64069fb..deaedfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f9d4fb91c10c9d5ba8cc032c1129ee6  evolution-2.25.4.tar.bz2
+99172fb2a973a35cb5d60b39a2a3683f  evolution-2.25.5.tar.bz2