diff --git a/.cvsignore b/.cvsignore
index abcf180..e71745e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1 @@
-evolution-1.5.94.1.tar.bz2
-evolution-2.0.0.tar.bz2
-evolution-2.0.1.tar.bz2
-evolution-2.0.2.tar.bz2
-evolution-2.0.3.tar.bz2
+evolution-2.1.4.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 8dc1127..72168f2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,12 +1,12 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-%define gal_version 2:2.2.4
-%define gtkhtml_version 3.3.2
-%define soup_version 2.2.0
-%define eds_version 1.0.3
+%define gal_version 2:2.3.3
+%define gtkhtml_version 3.5.4
+%define soup_version 2.2.2
+%define eds_version 1.1.4.1
 %define use_mozilla_nss 1
-%define evo_major 2.0
+%define evo_major 2.2
 %define libbonoboui_version 2.4.2
 %define orbit2_version 2.9.8
 %define gnome_icon_theme_version 1.3.6
@@ -27,12 +27,12 @@ ExcludeArch: ppc64
 %define nntp_support 1
 
 Name: evolution
-Version: 2.0.3
-Release: 2
+Version: 2.1.4
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
-Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.0/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{version}.tar.bz2
 
 # patches pulled from upstream CVS
 
@@ -79,11 +79,12 @@ Requires: spamassassin
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: redhat-menus >= 1.13
 Requires: gnutls
+Requires: dbus
 
-BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
-BuildRequires: libgal2-devel >= %{gal_version}
+#BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
+#BuildRequires: libgal2-devel >= %{gal_version}
 BuildRequires: libsoup-devel >= %{soup_version}
-BuildRequires: evolution-data-server-devel >= %{eds_version}
+#BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: libbonobo-devel >= 2.0
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
 BuildRequires: gnome-vfs2-devel >= 2.0
@@ -93,9 +94,11 @@ BuildRequires: libxml2-devel
 BuildRequires: GConf2-devel
 BuildRequires: intltool
 BuildRequires: ORBit2-devel >= %{orbit2_version}
+BuildRequires: atk-devel
 # kind of silly...
 BuildRequires: flex bison byacc libtool gettext
 BuildRequires: gnutls-devel
+BuildRequires: dbus-devel
 
 %if %{use_mozilla_nss}
 BuildRequires: mozilla-nspr-devel >= 37:%{mozilla_version}
@@ -216,12 +219,15 @@ if pkg-config openssl ; then
 fi
 %endif
 
-%configure --enable-gtk-doc=no --enable-ipv6 \
+%configure \
+  --enable-gtk-doc=yes \
+  --enable-ipv6 \
   --enable-file-locking=fcntl --enable-dot-locking=no \
   --with-sub-version=" (%{version}-%{release})" \
   --with-kde-applnk-path=no \
   --enable-file-chooser=yes \
-  %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags 
+  %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags \
+  --enable-plugins=all
 export tagname=CC
 make LIBTOOL=%{_bindir}/libtool
 
@@ -258,7 +264,7 @@ ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_evolution_addressbook-2.0.schemas apps_evolution_calendar-2.0.schemas apps_evolution_shell-2.0.schemas evolution-mail-2.0.schemas"
+SCHEMAS="apps_evolution_addressbook-2.2.schemas apps_evolution_calendar-2.2.schemas apps_evolution_shell-2.2.schemas evolution-mail-2.2.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
 done
@@ -282,13 +288,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mime-info/*
 %dir %{_datadir}/evolution
 %{_datadir}/evolution/%{evo_major}
+%{_datadir}/evolution-%{evo_major}/weather/*.png
 %{_datadir}/omf/evolution
 %{_datadir}/pixmaps/*
 %{_libdir}/bonobo/servers/*
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{evo_major}
-%dir %{_libdir}/evolution/%{evo_major}/camel-providers
-%dir %{_libdir}/evolution/%{evo_major}/camel-providers/*.so
 %dir %{_libdir}/evolution/%{evo_major}/components
 %dir %{_libdir}/evolution/%{evo_major}/components/*.so
 %dir %{_libdir}/evolution/%{evo_major}/evolution-calendar-importers
@@ -296,7 +301,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/evolution/%{evo_major}/evolution-addressbook-importers/
 %{_libdir}/evolution/%{evo_major}/evolution-addressbook-importers/*.so
 %{_libdir}/evolution/%{evo_major}/*.so.*
-%{_libdir}/evolution/%{evo_major}/camel-providers/*.urls
+%{_libdir}/evolution/%{evo_major}/plugins/*
 %dir %{_libexecdir}/evolution
 %{_libexecdir}/evolution/%{evo_major}
 
@@ -315,6 +320,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Wed Jan 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.4-1
+- Update from upstream stable 2.0.3 to unstable 2.1.4
+- Updated evo_major from 2.0 to 2.2
+- Removed camel packaging as this has been moved to evolution-data-server for Evolution 2.2
+- Added plugins to the packaged files
+- Added weather icons to the packaged files
+- Updated requirements:
+  * gtkhtml3 from 3.3.2 to 3.5.4
+  * libgal2 from 2.2.4 to 2.3.3
+  * eds from 1.0.3 to 1.1.4.1
+  * libsoup from 2.2.0 to 2.2.2
+- Added built-time requirement on atk-devel
+- Enable all plugins for now
+- Added requirement on dbus (for the new-mail-notify plugin)
+- Enable gtk-doc
+- Updated GConf schema name suffixes from 2.0 to 2.2
+
 * Sun Dec 19 2004 Christopher Aillon <caillon@redhat.com> 2.0.3-2
 - Rebuild against mozilla 1.7.5
 
diff --git a/sources b/sources
index 11e5120..543693a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a6c15b022f001d52b8533c42e83a462  evolution-2.0.3.tar.bz2
+7ea0196135c8efe66d90de13228e80c7  evolution-2.1.4.tar.bz2