diff --git a/evolution.changes b/evolution.changes
index d4e80e0..94264be 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 22 19:23:33 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Split text highlight plugin into a subpackage.
+- Add missing runtime dependency on the 'highlight' package.
+- Replace packageand() by boolean dependencies.
+
 -------------------------------------------------------------------
 Mon Jul 15 16:23:23 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/evolution.spec b/evolution.spec
index e8ac44d..bcbbfb7 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -37,7 +37,6 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  gtk-doc
-BuildRequires:  highlight
 BuildRequires:  intltool
 BuildRequires:  openldap2-devel
 BuildRequires:  pkgconfig
@@ -107,7 +106,7 @@ Summary:        Glade catalog for the Evolution groupware library
 Group:          Development/Tools/GUI Builders
 Requires:       %{name} = %{version}
 Requires:       glade
-Supplements:    packageand(glade:%{name}-devel)
+Supplements:    (glade and %{name}-devel)
 
 %description -n glade-catalog-evolution
 Evolution consists of modular components (at the moment: mailer,
@@ -124,7 +123,7 @@ Group:          Productivity/Networking/Email/Clients
 Requires:       %{name}
 Requires:       bogofilter
 Enhances:       %{name}
-Supplements:    packageand(%{name}:bogofilter)
+Supplements:    (%{name} and bogofilter)
 
 %description -n evolution-plugin-bogofilter
 Adds support for junk-mail filtering via bogofilter.
@@ -144,11 +143,23 @@ Group:          Productivity/Networking/Email/Clients
 Requires:       %{name}
 Requires:       spamassassin
 Enhances:       %{name}
-Supplements:    packageand(%{name}:spamassassin)
+Supplements:    (%{name} and spamassassin)
 
 %description -n evolution-plugin-spamassassin
 Adds support for junk-mail filtering via spamassassin.
 
+%package -n evolution-plugin-text-highlight
+Summary:        Text highlight plugin for the Evolution groupware suite
+Group:          Productivity/Networking/Email/Clients
+BuildRequires:  highlight
+Requires:       %{name}
+Requires:       highlight
+Enhances:       %{name}
+Supplements:    (%{name} and highlight)
+
+%description -n evolution-plugin-text-highlight
+Adds support to highlight syntax of mails and their attachments.
+
 %package devel
 Summary:        Development files for the Evolution groupware suite
 Group:          Development/Libraries/C and C++
@@ -237,7 +248,6 @@ translation-update-upstream
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
 %{_libdir}/evolution/modules/module-accounts-window.so
 %{_libdir}/evolution/modules/module-config-lookup.so
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml
 %{_libdir}/evolution/modules/module-mailto-handler.so
 %{_libdir}/evolution/modules/module-mdn.so
 %{_libdir}/evolution/modules/module-offline-alert.so
@@ -246,7 +256,6 @@ translation-update-upstream
 %{_libdir}/evolution/modules/module-prefer-plain.so
 %{_libdir}/evolution/modules/module-settings.so
 %{_libdir}/evolution/modules/module-startup-wizard.so
-%{_libdir}/evolution/modules/module-text-highlight.so
 %{_libdir}/evolution/modules/module-vcard-inline.so
 %{_libdir}/evolution/modules/module-webkit-editor.so
 %{_libdir}/evolution/modules/module-webkit-inspector.so
@@ -301,6 +310,10 @@ translation-update-upstream
 %{_libdir}/evolution/plugins/*-pst-import.*
 %{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml
 
+%files -n evolution-plugin-text-highlight
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml
+%{_libdir}/evolution/modules/module-text-highlight.so
+
 %files devel
 %doc ChangeLog HACKING MAINTAINERS NEWS-1.0 README
 %doc %{_datadir}/gtk-doc/html/evolution-*/