diff --git a/evolution.spec b/evolution.spec
index 98448b6..7653cd2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -288,6 +288,11 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
 # remove statically built libraries:
 find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
 
+# remove additional things we don't want
+%if ! %{inline_audio_support}
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so
+%endif
+
 %find_lang evolution-%{evo_base_version} --all-name --with-gnome
 
 grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang
@@ -376,17 +381,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-imap-features.so
+%{_libdir}/evolution/%{evo_base_version}/modules/module-itip-formatter.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-mail-config.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-online-accounts.so
+%{_libdir}/evolution/%{evo_base_version}/modules/module-prefer-plain.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so
+%{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so
+%{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so
 
+%if %{inline_audio_support}
+%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so
+%endif
+
 # Shared libraries:
 %{_libdir}/evolution/%{evo_base_version}/libcomposer.so
 %{_libdir}/evolution/%{evo_base_version}/libeabutil.so
@@ -439,12 +452,12 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
 
+%{evo_plugin_dir}/org-gnome-external-editor.eplug
+%{evo_plugin_dir}/liborg-gnome-external-editor.so
+
 %{evo_plugin_dir}/org-gnome-face.eplug
 %{evo_plugin_dir}/liborg-gnome-face.so
 
-#%{evo_plugin_dir}/org-gnome-image-inline.eplug
-#%{evo_plugin_dir}/liborg-gnome-image-inline.so
-
 %{evo_plugin_dir}/org-gnome-itip-formatter.eplug
 %{evo_plugin_dir}/liborg-gnome-itip-formatter.so