diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..d0d3dc6
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+evolution-data-server
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index 1302140..2a2bb45 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
+
+- added baselibs.conf file to build xxbit packages
+  for multilib support
+
 -------------------------------------------------------------------
 Wed Mar 26 12:11:16 CET 2008 - sbrabec@suse.cz
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index b32a15a..29601bf 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -18,7 +18,7 @@ Group:          Development/Libraries/GNOME
 AutoReqProv:    on
 Summary:        Evolution Data Server
 Version:        2.22.0
-Release:        6
+Release:        12
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.21/%{name}-%{version}.tar.bz2
 Patch0:         evolution-data-server-configure.patch
 # PATCH-FIX-UPSTREAM bnc-164367-gw-attachments-appts-throw-error.patch bnc164367 - Fix is in upstream svn.
@@ -61,6 +61,7 @@ and calendar in the GNOME Desktop.
 
 
 %package devel
+License:        GPL v2 or later
 Summary:        Evolution Data Server Development Files
 Group:          Development/Libraries/GNOME
 Requires:       evolution-data-server = %{?epoch:}%{version}-%{release}
@@ -82,7 +83,8 @@ information.
 
 
 %package doc
-Summary:        Additional Package Documentation for the evolution-data-server.
+License:        GPL v2 or later
+Summary:        Additional Package Documentation for the evolution-data-server
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version}
 
@@ -165,6 +167,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Apr 10 2008 ro@suse.de
+- added baselibs.conf file to build xxbit packages
+  for multilib support
 * Wed Mar 26 2008 sbrabec@suse.cz
 - Fixed GroupWise attachment crash on x86_64 (bgo#522389).
 * Fri Mar 14 2008 maw@suse.de
@@ -545,7 +550,7 @@ rm -rf $RPM_BUILD_ROOT
   152062 Evolution won't show an attachment
   158093 Evolution: Groupwise "Sent Items" folder should have a
   "To:" column instead of a "From:" column
-* Wed Mar 15 2006 vvaradhan@novell.com
+* Thu Mar 16 2006 vvaradhan@novell.com
 - Fixes (bnc)
   157323 Messages deleted from Groupwise folder remain in Evo.
   156559 Evolution won't show me 827 messages
@@ -611,7 +616,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fixed devel dependencies.
 * Thu Dec 01 2005 gekker@suse.de
 - Update to version 1.4.2.1
-* Wed Nov 02 2005 dmueller@suse.de
+* Thu Nov 03 2005 dmueller@suse.de
 - don't build as root
 * Thu Oct 13 2005 gekker@suse.de
 - Update to version 1.4.1
@@ -625,7 +630,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Sep 05 2005 rodrigo@suse.de
 - Update to version 1.4.0
 - Removed upstreamed patches
-* Wed Aug 24 2005 gekker@suse.de
+* Thu Aug 25 2005 gekker@suse.de
 - Update to version 1.3.8
 - Fix brokeness inlibical
 * Sat Aug 13 2005 aj@suse.de
@@ -693,7 +698,7 @@ rm -rf $RPM_BUILD_ROOT
   privileges) in lock helper (CAN-2005-0102, #50116).
 * Mon Jan 24 2005 meissner@suse.de
 - Fixed some gcc 4 warnings/error that show code problems.
-* Fri Jan 14 2005 clahey@suse.de
+* Sat Jan 15 2005 clahey@suse.de
 - Update to version 1.1.3.
 * Thu Jan 06 2005 gekker@suse.de
 - Update to version 1.1.2
@@ -718,7 +723,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed evolution-data-server-0.0.99.dif which is in upstream source
 * Fri Sep 17 2004 ro@suse.de
 - readd evolution-data-server-0.0.99.dif to fix parallel build
-* Mon Sep 13 2004 dobey@suse.de
+* Tue Sep 14 2004 dobey@suse.de
 - Updated to version 1.0.0
 - Removed evolution-data-server-0.0.99.dif which was not changelogged,
   and seems to not actually change anything
@@ -728,7 +733,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update to version 0.0.99
 * Wed Aug 18 2004 dobey@suse.de
 - Fix LDAP support and remove unused configure options
-* Fri Aug 13 2004 dobey@suse.de
+* Sat Aug 14 2004 dobey@suse.de
 - Update to version 0.0.98
 - Add dependencies to the evolution-data-server-devel package
 * Thu Aug 05 2004 dobey@suse.de