diff --git a/evolution.changes b/evolution.changes
index 6b7c1e8..558f9c7 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun May 23 16:29:27 CEST 2010 - vuntz@opensuse.org
+
+- Move libeconduit.so to the pilot subpackage, to make evolution
+  not depend on the pilot libraries unless really needed. Fix
+  bnc#580612.
+- Make evolution-pilot supplement evolution and gnome-pilot.
+
 -------------------------------------------------------------------
 Thu Apr 29 10:22:24 IST 2010 - lakhil@novell.com
 
diff --git a/evolution.spec b/evolution.spec
index acc755f..1ae3913 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -61,7 +61,7 @@ Group:          Productivity/Networking/Email/Clients
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
 %define evolution_base_version 2.30
 Version:        2.30.1.2
-Release:        1
+Release:        2
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
 # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
@@ -129,6 +129,7 @@ License:        GFDLv1.1 ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar)
 Summary:        The Integrated GNOME Mail, Calendar, and Addressbook Suite
 Group:          Productivity/Networking/Email/Clients
 Requires:       evolution = %{version}
+Supplements:    packageand(%{name}:gnome-pilot}
 
 %description pilot
 Evolution consists of modular components (at the moment: mailer,
@@ -276,6 +277,7 @@ fi
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/*
 %{_libdir}/evolution/*/*.so.*
+%exclude %{_libdir}/evolution/*/libeconduit.so.*
 %dir %{_libdir}/evolution/*/modules/
 %{_libdir}/evolution/*/modules/*-module-addressbook.*
 %{_libdir}/evolution/*/modules/*-module-calendar.*
@@ -336,6 +338,7 @@ fi
 %files pilot
 %defattr(-,root,root)
 %{_datadir}/gnome-pilot/conduits/*.conduit
+%{_libdir}/evolution/*/libeconduit.so.*
 %{_libdir}/evolution/*/conduits
 
 %files mono-plugins