diff --git a/evolution.spec b/evolution.spec
index 48518be..d0a721b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -26,6 +26,10 @@
 # Coverity scan can override this to 0, to skip checking in gtk-doc generated code
 %{!?with_docs: %global with_docs 1}
 
+%if 0%{?flatpak}
+%global with_docs 0
+%endif
+
 %define evo_plugin_dir %{_libdir}/evolution/plugins
 
 ### Abstract ###
@@ -53,20 +57,26 @@ Obsoletes: evolution-tests <= 3.31.1
 
 ## Dependencies ###
 
+%if ! 0%{?flatpak}
 Requires: %{_bindir}/killall
-Requires: evolution-data-server >= %{eds_version}
 Requires: gvfs
+%endif
+Requires: evolution-data-server >= %{eds_version}
 Requires: gspell
 Requires: highlight
 Requires: %{name}-langpacks = %{version}-%{release}
 
 ### Build Dependencies ###
 
+%if ! 0%{?flatpak}
 BuildRequires: %{_bindir}/killall
+%endif
 BuildRequires: cmake
 BuildRequires: gcc
 BuildRequires: gettext
+%if %{with_docs}
 BuildRequires: gtk-doc
+%endif
 BuildRequires: highlight
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: itstool
@@ -76,7 +86,7 @@ BuildRequires: yelp-tools
 BuildRequires: pkgconfig(atk)
 BuildRequires: pkgconfig(cairo-gobject)
 BuildRequires: pkgconfig(camel-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(enchant)
+BuildRequires: pkgconfig(enchant-2)
 BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(gcr-3)
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
@@ -143,6 +153,8 @@ Obsoletes: libgal2-devel <= %{last_libgal2_version}
 %description devel
 Development files needed for building things which link against %{name}.
 
+%if %{with_docs}
+
 %package devel-docs
 Summary: Developer documentation for Evolution
 Requires: devhelp
@@ -152,6 +164,8 @@ BuildArch: noarch
 %description devel-docs
 This package contains developer documentation for Evolution.
 
+%endif
+
 %package langpacks
 Summary: Translations for %{name}
 BuildArch: noarch
@@ -217,6 +231,11 @@ for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox
 done
 
+%if 0%{?flatpak}
+mv data/org.gnome.Evolution.desktop.in.in data/org.gnome.Evolution.desktop.in.i
+cat data/org.gnome.Evolution.desktop.in.i | sed -e "s/Icon=evolution/Icon=org.gnome.Evolution/" >data/org.gnome.Evolution.desktop.in.in
+%endif
+
 %build
 
 mkdir -p _build
@@ -291,9 +310,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 %find_lang evolution --all-name --with-gnome
 
-grep "/usr/share/locale" evolution.lang > translations.lang
+grep "%{_datadir}/locale" evolution.lang > translations.lang
 %if %{with_docs}
-grep -v "/usr/share/locale" evolution.lang > help.lang
+grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %ldconfig_scriptlets
@@ -474,6 +493,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{_libdir}/pkgconfig/evolution-shell-3.0.pc
 %{_libdir}/pkgconfig/libemail-engine.pc
 
+%if %{with_docs}
+
 %files devel-docs
 %doc %{_datadir}/gtk-doc/html/evolution-mail-composer
 %doc %{_datadir}/gtk-doc/html/evolution-mail-engine
@@ -481,6 +502,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %doc %{_datadir}/gtk-doc/html/evolution-shell
 %doc %{_datadir}/gtk-doc/html/evolution-util
 
+%endif
+
 %files langpacks -f _build/translations.lang
 
 %if %{with_docs}