diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index 70cd7bc9b18d..79694ae258b2 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.37 2007/07/06 18:36:44 drochner Exp $
+$NetBSD: distinfo,v 1.38 2007/07/18 12:45:39 jmmv Exp $
 
 SHA1 (evolution-data-server-1.10.3.1.tar.bz2) = d6406d617a8d72b20a1c26083f0d2c090092d6e0
 RMD160 (evolution-data-server-1.10.3.1.tar.bz2) = 20aecc3e9917a07df0ebd31879ac283866a4d5a1
 Size (evolution-data-server-1.10.3.1.tar.bz2) = 7119022 bytes
+SHA1 (patch-aa) = 5f16e511990b291a9aa0e68e81cd4b46ad21b4c5
+SHA1 (patch-ab) = b3d5e176aa792c5a31558f733f715ec237aa5af4
 SHA1 (patch-af) = 1e458720684cfe3823b3b73665044336588c4620
 SHA1 (patch-ak) = e363f45994be14f7c1f0cf6cfd35e66646c69a51
 SHA1 (patch-al) = 97d5c7889b886535a7cc63c00b6193130f6fa320
diff --git a/mail/evolution-data-server/patches/patch-aa b/mail/evolution-data-server/patches/patch-aa
new file mode 100644
index 000000000000..a202666e17fe
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.7 2007/07/18 12:45:40 jmmv Exp $
+
+--- addressbook/libedata-book/Makefile.in.orig	2007-07-17 13:01:34.000000000 +0200
++++ addressbook/libedata-book/Makefile.in
+@@ -65,9 +65,7 @@ libedata_book_1_2_la_DEPENDENCIES = $(am
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+ 	$(am__DEPENDENCIES_1)
+ am__objects_1 = e-data-book-marshal.lo
+-am__objects_2 = Evolution-DataServer-Addressbook-common.lo \
+-	Evolution-DataServer-Addressbook-skels.lo \
+-	Evolution-DataServer-Addressbook-stubs.lo
++am__objects_2 =
+ am_libedata_book_1_2_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+ 	e-book-backend-factory.lo e-book-backend-sexp.lo \
+ 	e-book-backend-summary.lo e-book-backend-cache.lo \
diff --git a/mail/evolution-data-server/patches/patch-ab b/mail/evolution-data-server/patches/patch-ab
new file mode 100644
index 000000000000..2d5f7d6409dc
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2007/07/18 12:45:40 jmmv Exp $
+
+--- calendar/libedata-cal/Makefile.in.orig	2007-07-17 13:01:35.000000000 +0200
++++ calendar/libedata-cal/Makefile.in
+@@ -63,9 +63,7 @@ am__DEPENDENCIES_1 =
+ libedata_cal_1_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/calendar/libecal/libecal-1.2.la \
+ 	$(top_builddir)/libedataserver/libedataserver-1.2.la
+-am__objects_1 = Evolution-DataServer-Calendar-common.lo \
+-	Evolution-DataServer-Calendar-skels.lo \
+-	Evolution-DataServer-Calendar-stubs.lo
++am__objects_1 =
+ am_libedata_cal_1_2_la_OBJECTS = $(am__objects_1) e-cal-backend.lo \
+ 	e-cal-backend-cache.lo e-cal-backend-factory.lo \
+ 	e-cal-backend-sexp.lo e-cal-backend-sync.lo \