diff --git a/.gitignore b/.gitignore
index bdc6eaa..fab9a5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-2.91.2.tar.bz2
 /evolution-data-server-2.91.3.tar.bz2
 /evolution-data-server-2.91.4.tar.bz2
+/evolution-data-server-2.91.5.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 807c0d2..42fb675 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -18,13 +18,14 @@
 
 %define use_gnome_keyring 1
 
-%define camel_provider_dir %{_libdir}/evolution-data-server-1.2/camel-providers
-%define eds_extensions_dir %{_libdir}/evolution-data-server-1.2/extensions
+%define camel_provider_dir %{_libdir}/evolution-data-server/camel-providers
+%define ebook_backends_dir %{_libdir}/evolution-data-server/addressbook-backends
+%define ecal_backends_dir %{_libdir}/evolution-data-server/calendar-backends
 
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.91.4
+Version: 2.91.5
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -257,9 +258,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.Calendar.service
 %{_datadir}/pixmaps/evolution-data-server
 
-%dir %{_libdir}/evolution-data-server-1.2
+%dir %{_libdir}/evolution-data-server
 %dir %{camel_provider_dir}
-%dir %{eds_extensions_dir}
+%dir %{ebook_backends_dir}
+%dir %{ecal_backends_dir}
 
 # Camel providers:
 %{camel_provider_dir}/libcamelgroupwise.so
@@ -287,22 +289,22 @@ rm -rf $RPM_BUILD_ROOT
 %{camel_provider_dir}/libcamelsmtp.urls
 
 # e-d-s extensions:
-%{eds_extensions_dir}/libebookbackendfile.so
-%{eds_extensions_dir}/libebookbackendgoogle.so
-%{eds_extensions_dir}/libebookbackendgroupwise.so
-%{eds_extensions_dir}/libebookbackendldap.so
-%{eds_extensions_dir}/libebookbackendvcf.so
-%{eds_extensions_dir}/libebookbackendwebdav.so
-%{eds_extensions_dir}/libecalbackendcaldav.so
-%{eds_extensions_dir}/libecalbackendcontacts.so
-%{eds_extensions_dir}/libecalbackendfile.so
-%{eds_extensions_dir}/libecalbackendgroupwise.so
-%{eds_extensions_dir}/libecalbackendhttp.so
-%{eds_extensions_dir}/libecalbackendweather.so
+%{ebook_backends_dir}/libebookbackendfile.so
+%{ebook_backends_dir}/libebookbackendgoogle.so
+%{ebook_backends_dir}/libebookbackendgroupwise.so
+%{ebook_backends_dir}/libebookbackendldap.so
+%{ebook_backends_dir}/libebookbackendvcf.so
+%{ebook_backends_dir}/libebookbackendwebdav.so
+%{ecal_backends_dir}/libecalbackendcaldav.so
+%{ecal_backends_dir}/libecalbackendcontacts.so
+%{ecal_backends_dir}/libecalbackendfile.so
+%{ecal_backends_dir}/libecalbackendgroupwise.so
+%{ecal_backends_dir}/libecalbackendhttp.so
+%{ecal_backends_dir}/libecalbackendweather.so
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/evolution-data-server-%{eds_base_version}
+%{_includedir}/evolution-data-server
 %{_libdir}/libcamel-1.2.so
 %{_libdir}/libcamel-provider-1.2.so
 %{_libdir}/libebackend-1.2.so
@@ -337,6 +339,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jan 10 2011 Milan Crha <mcrha@redhat.com> - 2.91.5-1
+- Update to 2.91.5
+
 * Mon Dec 20 2010 Milan Crha <mcrha@redhat.com> - 2.91.4-1
 - Update to 2.91.4
 
diff --git a/sources b/sources
index dc1584f..8ecdede 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48fea9697ce5bc34a84ad9fa3c157813  evolution-data-server-2.91.4.tar.bz2
+46e3080b2bdc0703b1aaad44e75dbf99  evolution-data-server-2.91.5.tar.bz2