diff --git a/.cvsignore b/.cvsignore
index 7d4ea4d..d11b534 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-1.5.93.tar.bz2
+evolution-1.5.94.1.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 54b8122..f5df6cb 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,12 +1,12 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-%define gal_version 2:2.1.14
+%define gal_version 2:2.2.0
 %define gtkhtml_version 3.3.0
-%define soup_version 2.1.13
-%define eds_version 0.0.98
+%define soup_version 2.2.0
+%define eds_version 0.0.99
 %define use_mozilla_nss 1
-%define evo_major 1.5
+%define evo_major 2.0
 %define libbonoboui_version 2.4.2
 %define orbit2_version 2.9.8
 %define gnome_icon_theme_version 1.3.6
@@ -31,8 +31,8 @@ ExcludeArch: ppc64
 %define nntp_support 1
 
 Name: evolution
-Version: 1.5.93
-Release: 2
+Version: 1.5.94.1
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -249,7 +249,7 @@ ln -sf ../desktop-menu-patches/redhat-email.desktop $RPM_BUILD_ROOT/%{_datadir}/
 rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop
 
 # evolution link
-ln -sf ./evolution-1.5 $RPM_BUILD_ROOT/%{_bindir}/evolution
+ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
 
 
 %find_lang %name-%{evo_major}
@@ -257,7 +257,7 @@ ln -sf ./evolution-1.5 $RPM_BUILD_ROOT/%{_bindir}/evolution
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="apps_evolution_addressbook-1.5.schemas apps_evolution_calendar-1.5.schemas apps_evolution_shell-1.5.schemas evolution-mail-1.5.schemas"
+SCHEMAS="apps_evolution_addressbook-2.0.schemas apps_evolution_calendar-2.0.schemas apps_evolution_shell-2.0.schemas evolution-mail-2.0.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
 done
@@ -276,11 +276,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/*
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/gnome/help/evolution-%{evo_major}
+%{_datadir}/gnome/help/evolution-1.5
 %{_datadir}/idl/evolution-%{evo_major}
 %{_datadir}/mime-info/*
 %dir %{_datadir}/evolution
-%{_datadir}/evolution/1.5
+%{_datadir}/evolution/%{evo_major}
 %{_datadir}/omf/evolution
 %{_datadir}/pixmaps/*
 %{_libdir}/bonobo/servers/*
@@ -292,8 +292,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/evolution/%{evo_major}/components/*.so
 %dir %{_libdir}/evolution/%{evo_major}/evolution-calendar-importers
 %dir %{_libdir}/evolution/%{evo_major}/evolution-calendar-importers/*.so
-%dir %{_libdir}/evolution/1.5/evolution-addressbook-importers/
-%{_libdir}/evolution/1.5/evolution-addressbook-importers/*.so
+%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
 %dir %{_libexecdir}/evolution
@@ -314,6 +314,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Tue Aug 31 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.94.1-1
+- updated tarball from 1.5.93 to 1.5.94.1
+- the BASE_VERSION in the configure.in script has finally been updated from 1.5 to 2.0 (affects OAFIIDs, install dirs, binary names etc); updated evo_major and various other parts of the spec-file to reflect this; however documentation is still 1.5 in upstream tarball
+- updated dependency on libgal2 from 2:2.1.14 to 2:2.2.0
+- updated dependency on libsoup from 2.1.13 to 2.2.0
+- updated dependency on e-d-s from 0.0.98 to 0.0.99
+
 * Tue Aug 17 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.93-2
 - updated gnome-icon-theme requirement from 1.2.0 to 1.3.6 to fix problem with missing stock icons (bz #130142)
 
diff --git a/sources b/sources
index 573e11a..18f0dbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a01dc293bca189461f6cbd61b0a5a0ee  evolution-1.5.93.tar.bz2
+02afa72a16e0308ab610c55ca751e317  evolution-1.5.94.1.tar.bz2