diff --git a/.abf.yml b/.abf.yml
index 10f4298..fe57f6b 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  "evolution-mapi-0.32.2.tar.bz2": 0bcee974af1f596f3f027da8ad6969b198dd6fcf
+  "evolution-mapi-3.4.1.tar.xz": 78094a5c7d9d10513cf3bc35424780189801babb
diff --git a/evolution-mapi-0.31.2-fix-linking.patch b/evolution-mapi-0.31.2-fix-linking.patch
deleted file mode 100644
index 527ef3d..0000000
--- a/evolution-mapi-0.31.2-fix-linking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -p -up evolution-mapi-0.31.2/src/libexchangemapi/Makefile.am.2147483647 evolution-mapi-0.31.2/src/libexchangemapi/Makefile.am
---- evolution-mapi-0.31.2/src/libexchangemapi/Makefile.am.2147483647	2010-05-21 06:23:20.000000000 +0200
-+++ evolution-mapi-0.31.2/src/libexchangemapi/Makefile.am	2010-05-24 13:17:31.000000000 +0200
-@@ -39,7 +39,7 @@ libexchangemapi_1_0_la_LIBADD =			\
- 	$(LIBEDATASERVER_LIBS)			\
- 	$(LIBECAL_LIBS)				\
- 	$(LIBMAPI_LIBS)				\
--	$(CAMEL_LIBS)
-+	$(CAMEL_LIBS) -lsamba-util
- 
- libexchangemapi_1_0_la_LDFLAGS = $(NO_UNDEFINED)
- 
diff --git a/evolution-mapi.spec b/evolution-mapi.spec
index fc2272f..5061ddd 100644
--- a/evolution-mapi.spec
+++ b/evolution-mapi.spec
@@ -1,13 +1,13 @@
-%define version 0.32.2
-%define evo_version 2.31.5
-%define eds_version 2.31.1
+%define version 3.4.1
+%define evo_version 3.4.1
+%define eds_version 3.4.1
 %define libmapi_version 0.9
 %define intltool_version 0.35.5
 
-%define evo_major 2.32
+%define evo_major 3.4
 %define eds_major 1.2
 
-%define strict_build_settings 1
+%define strict_build_settings 0
 
 %define api 1.0
 %define major 0
@@ -16,13 +16,12 @@
 
 Name: evolution-mapi
 Version: %version
-Release: %mkrel 1
+Release: 1
 Group: Networking/Mail
-Summary: Evolution extension for MS Exchange 2007 servers
+Summary: Evolution extension for MS Exchange 2007/2010 servers
 License: LGPLv2+
 URL: http://www.gnome.org/projects/evolution-mapi/
-Source: http://ftp.gnome.org/pub/GNOME/sources/%name/%name-%{version}.tar.bz2
-Patch0: evolution-mapi-0.31.2-fix-linking.patch
+Source: http://ftp.gnome.org/pub/GNOME/sources/%name/%name-%{version}.tar.xz
 Requires: evolution >= %{evo_version}
 Requires: evolution-data-server >= %{eds_version}
 Requires: %libname >= %version-%release
@@ -30,6 +29,9 @@ BuildRoot: {_tmppath}/%{name}-%{version}-root
 
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: evolution-devel >= %{evo_version}
+BuildRequires: pkgconfig(libebackend-1.2)
+BuildRequires: pkgconfig(libedata-cal-1.2)
+BuildRequires: pkgconfig(libedata-book-1.2)
 BuildRequires: gettext
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: gtk-doc
@@ -40,14 +42,14 @@ BuildRequires: tdb-devel
 BuildRequires: samba4-devel
 
 %description
-This package allows Evolution to interact with MS Exchange 2007 servers.
+This package allows Evolution to interact with MS Exchange 2007/2010 servers.
 
 %package -n %libname
 Summary: Shared library of %name
 Group: System/Libraries
 
 %description -n %libname
-This package allows Evolution to interact with MS Exchange 2007 servers.
+This package allows Evolution to interact with MS Exchange 2007/2010 servers.
 
 
 %package -n %develname
@@ -65,8 +67,6 @@ Development files needed for building things which link against %{name}.
 
 %prep
 %setup -q
-%apply_patches
-autoreconf -fi
 
 %build
 
@@ -107,10 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL README
 %{_libdir}/evolution/%{evo_major}/plugins/*
-%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelmapi.so
-%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/libcamelmapi.urls
-%{_libdir}/evolution-data-server-%{eds_major}/extensions/libebookbackendmapi.so
-%{_libdir}/evolution-data-server-%{eds_major}/extensions/libecalbackendmapi.so
+%{_libdir}/evolution-data-server/camel-providers/libcamelmapi.so
+%{_libdir}/evolution-data-server/camel-providers/libcamelmapi.urls
+%{_libdir}/evolution-data-server/addressbook-backends/libebookbackendmapi.so
+%{_libdir}/evolution-data-server/calendar-backends/libecalbackendmapi.so
 %{_datadir}/evolution-data-server-%{evo_major}/mapi
 
 %files -n %libname
@@ -121,12 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_includedir}/evolution-data-server-%{evo_major}/mapi
 %{_libdir}/libexchangemapi-1.0.so
-%{_libdir}/libexchangemapi-1.0.la
 %{_libdir}/pkgconfig/libexchangemapi-1.0.pc
 
 
 %changelog
-* Mon Feb 07 2011 Götz Waschk <waschk@mandriva.org> 0.32.2-1mdv2011.0
+* Thu Jun 14 2012 Crispin Boylan <crisb@mandriva.org> 3.4.1-1
++ Revision: 805750
+- New release
+
+* Mon Feb 07 2011 Götz Waschk <waschk@mandriva.org> 0.32.2-1
 + Revision: 636534
 - update to new version 0.32.2
 
@@ -273,4 +276,3 @@ rm -rf $RPM_BUILD_ROOT
 + Revision: 361720
 - import evolution-mapi
 
-