diff --git a/evolution-data-server-1.8.0-no-gnome-common.patch b/evolution-data-server-1.8.0-no-gnome-common.patch
deleted file mode 100644
index edb557f..0000000
--- a/evolution-data-server-1.8.0-no-gnome-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- evolution-data-server-1.10.1/configure.in.no-gnome-common	2007-04-09 08:44:46.000000000 -0400
-+++ evolution-data-server-1.10.1/configure.in	2007-04-09 12:15:42.000000000 -0400
-@@ -1209,8 +1209,6 @@
- dnl CFLAGS and LIBS and stuff
- dnl *************************
- 
--GNOME_COMPILE_WARNINGS(yes)
--CFLAGS="$CFLAGS $WARN_CFLAGS"
- case $CFLAGS in
- *-Wall*)
- 	# Turn off the annoying "comparison between signed and unsigned"
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 57abc75..da63d1a 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -31,33 +31,30 @@
 
 Name: evolution-data-server
 Version: 2.25.90
-Release: 4%{?dist}
-License: LGPLv2
+Release: 5%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
-URL: http://www.gnome.org/projects/evolution/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.23/%{name}-%{version}.tar.bz2
+License: LGPLv2+
+URL: http://projects.gnome.org/evolution/
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
 
 ### Patches ###
 
-# Remove gnome-common macros from configure.in.
-Patch10: evolution-data-server-1.8.0-no-gnome-common.patch
-
 # RH bug #215702 / GNOME bug #487988
-Patch11: evolution-data-server-1.8.0-fix-ldap-query.patch
+Patch10: evolution-data-server-1.8.0-fix-ldap-query.patch
 
 # GNOME bug #373146
-Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
+Patch11: 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
+Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
 # Work around broken libical.pc
-Patch14: evolution-data-server-2.25.90-libical-includedir.patch
+Patch13: evolution-data-server-2.25.90-libical-includedir.patch
 
 ### Build Dependencies ###
 
@@ -68,6 +65,7 @@ BuildRequires: db4-devel
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gnome-common
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -137,11 +135,10 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -q
 
-%patch10 -p1 -b .no-gnome-common
-%patch11 -p1 -b .fix-ldap-query
-%patch12 -p1 -b .camel-folder-summary-crash
-%patch13 -p1 -b .fix-64bit-acinclude
-%patch14 -p1 -b .libical-includedir
+%patch10 -p1 -b .fix-ldap-query
+%patch11 -p1 -b .camel-folder-summary-crash
+%patch12 -p1 -b .fix-64bit-acinclude
+%patch13 -p1 -b .libical-includedir
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -387,6 +384,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Fri Feb 06 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-5.fc11
+- Update BuildRoot, License, Source and URL tags.
+- Require gnome-common so we don't have to patch it out.
+
 * Wed Feb 04 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-4.fc11
 - ... and fix our own <ical.h> includes too.