diff --git a/evolution.changes b/evolution.changes
index c4003f3..463df3d 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr  8 17:23:32 UTC 2015 - zaitor@opensuse.org
+
+- Split the extensions in their own respective packages. This
+  allows to extend evolution with features as required.
+
 -------------------------------------------------------------------
 Mon Mar 23 11:13:55 UTC 2015 - zaitor@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index 8cb1b45..b2c431a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -90,7 +90,6 @@ BuildRequires:  pkgconfig(shared-mime-info) >= 0.22
 BuildRequires:  pkgconfig(sm)
 Requires:       evolution-data-server >= %{_version}
 Recommends:     %{name}-lang
-Recommends:     bogofilter
 # Mono and python plugins were available until evo 3.5.x
 Obsoletes:      evolution-mono-plugins < %{version}
 Obsoletes:      evolution-python-plugins < %{version}
@@ -119,6 +118,28 @@ Evolution or embed the existing ones in other applications.
 This package provides a catalog for Glade, to allow the use of Evolution
 widgets in Glade.
 
+%package -n evolution-plugin-bogofilter
+Summary:        Evolution extension -- bogofilter
+Group:          Productivity/Networking/Email/Clients
+Requires:       %{name}
+Requires:       bogofilter
+Supplements:    packageand(%{name}:bogofilter)
+Enhances:       %{name}
+
+%description -n evolution-plugin-bogofilter
+Adds support for junk-mail filtering via bogofilter.
+
+%package -n evolution-plugin-spamassassin
+Summary:        Evolution extension -- spamassassin
+Group:          Productivity/Networking/Email/Clients
+Requires:       %{name}
+Requires:       spamassassin
+Supplements:    packageand(%{name}:spamassassin)
+Enhances:       %{name}
+
+%description -n evolution-plugin-spamassassin
+Adds support for junk-mail filtering via spamassassin.
+
 %package devel
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
@@ -187,8 +208,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_datadir}/GConf/gsettings/evolution.convert
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/evolution.appdata.xml
-%{_datadir}/appdata/evolution-bogofilter.metainfo.xml
-%{_datadir}/appdata/evolution-spamassassin.metainfo.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/evolution
 %{_datadir}/icons/hicolor/*/apps/*.png
@@ -202,8 +221,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/*.so
 %{_libdir}/evolution/modules/module-addressbook.so
 %{_libdir}/evolution/modules/module-backup-restore.so
-%{_libdir}/evolution/modules/module-bogofilter.so
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
 %{_libdir}/evolution/modules/module-book-config-google.so
 %{_libdir}/evolution/modules/module-book-config-ldap.so
 %{_libdir}/evolution/modules/module-book-config-local.so
@@ -230,8 +247,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/modules/module-plugin-manager.so
 %{_libdir}/evolution/modules/module-prefer-plain.so
 %{_libdir}/evolution/modules/module-settings.so
-%{_libdir}/evolution/modules/module-spamassassin.so
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
 %{_libdir}/evolution/modules/module-startup-wizard.so
 #{_libdir}/evolution/%{evolution_base_version}/modules/module-text-highlight.so
 %{_libdir}/evolution/modules/module-vcard-inline.so
@@ -278,6 +293,18 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/glade/modules/libgladeevolution.so
 %{_datadir}/glade/catalogs/evolution.xml
 
+%files -n evolution-plugin-bogofilter
+%defattr(-,root,root)
+%{_datadir}/appdata/evolution-bogofilter.metainfo.xml
+%{_libdir}/evolution/modules/module-bogofilter.so
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
+
+%files -n evolution-plugin-spamassassin
+%defattr(-,root,root)
+%{_datadir}/appdata/evolution-spamassassin.metainfo.xml
+%{_libdir}/evolution/modules/module-spamassassin.so
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/evolution*