diff --git a/evolution.spec b/evolution.spec
index 56f748d..c17e451 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.46.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -287,7 +287,14 @@ fi
 %global tnef_flags -DENABLE_YTNEF=OFF
 %endif
 
-CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
+%if 0%{?flatpak}
+%global temp_home "-DTEMP_HOME=1"
+%else
+%global temp_home ""
+%endif
+
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home"
+export CFLAGS
 
 %cmake -G "Unix Makefiles" \
 	-DENABLE_MAINTAINER_MODE=OFF \
@@ -296,7 +303,6 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 	-DENABLE_PLUGINS=all \
 	%if 0%{?flatpak}
 	"-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
-	"-DTEMP_HOME=1" \
 	%endif
 	%{nil}
 
@@ -571,6 +577,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Feb 28 2023 Milan Crha <mcrha@redhat.com> - 3.46.4-2
+- Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak)
+
 * Fri Feb 10 2023 Milan Crha <mcrha@redhat.com> - 3.46.4-1
 - Update to 3.46.4