diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index b194c12..486cc2e 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -6,6 +6,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 glib2_version 2.46.0
 %define gtk3_version 3.10.0
 %define gcr_version 3.4
@@ -64,13 +68,15 @@ BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: gettext
 BuildRequires: gperf
+%if %{with_docs}
 BuildRequires: gtk-doc >= %{gtk_doc_version}
+%endif
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libdb-devel
 BuildRequires: perl-generators
 BuildRequires: vala
 BuildRequires: sendmail
-%if 0%{?flatpak}
+%if ! 0%{?flatpak}
 BuildRequires: systemd
 %endif
 
@@ -242,6 +248,9 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d
         %if 0%{?flatpak}
         -DWITH_SYSTEMDUSERUNITDIR=OFF \
         %endif
+	%if "%{?_eds_dbus_services_prefix}" != ""
+	-DDBUS_SERVICES_PREFIX=%{?_eds_dbus_services_prefix} \
+	%endif
 	%ldap_flags %krb5_flags %ssl_flags \
 	%largefile_flags %gtkdoc_flags \
 	..