diff --git a/claws-mail-3.17.8-socket-tmpdir.patch b/claws-mail-3.17.8-socket-tmpdir.patch
new file mode 100644
index 0000000..48819a2
--- /dev/null
+++ b/claws-mail-3.17.8-socket-tmpdir.patch
@@ -0,0 +1,17 @@
+diff -Naur claws-mail-3.17.8-orig/src/main.c claws-mail-3.17.8/src/main.c
+--- claws-mail-3.17.8-orig/src/main.c	2020-10-19 12:37:56.000000000 +0200
++++ claws-mail-3.17.8/src/main.c	2021-01-16 20:49:20.094227916 +0100
+@@ -2305,12 +2305,7 @@
+ 		gint stat_ok;
+ 
+ 		socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
+-					   g_get_tmp_dir(), G_DIR_SEPARATOR,
+-#if HAVE_GETUID
+-					   getuid());
+-#else
+-					   0);
+-#endif
++                                     g_get_user_runtime_dir(), G_DIR_SEPARATOR);
+ 		stat_ok = g_stat(socket_dir, &st);
+ 		if (stat_ok < 0 && errno != ENOENT) {
+ 			g_print("Error stat'ing socket_dir %s: %s\n",
diff --git a/claws-mail.spec b/claws-mail.spec
index 9b65ffb..ae33a07 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -23,7 +23,7 @@ Obsoletes: claws-mail-plugins-python < 3.17.4-1
 
 Name:           claws-mail
 Version:        3.17.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Email client and news reader based on GTK+
 License:        GPLv3+
 URL:            http://claws-mail.org
@@ -31,8 +31,10 @@ Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{versio
 
 # rhbz#1179279
 Patch11:        claws-mail-system-crypto-policies.patch
+# 2021-01-16 upstream git
+Patch12: claws-mail-3.17.8-socket-tmpdir.patch
 
-BuildRequires:  gcc, flex, bison
+BuildRequires:  gcc, flex, bison, make
 BuildRequires:  glib2-devel >= 2.6.2
 BuildRequires:  gtk2-devel >= 2.10.0
 BuildRequires:  gnutls-devel
@@ -95,7 +97,6 @@ BuildRequires:  libical-devel
 BuildRequires:  gumbo-parser-devel
 BuildRequires:  gcc-c++
 %endif
-BuildRequires: make
 
 # for TLS SNI capable libetpan
 Requires: libetpan%{?_isa} >= 1.9.2
@@ -428,6 +429,7 @@ exporting of your meetings or all your calendars.
 %if 0%{?fedora} > 20
 %patch11 -p1 -b.syscrypto
 %endif
+%patch12 -p1 -b .sockettmpdir
 
 # guard for pluginapi
 SOURCEAPI=$(grep -A 1 VERSION_NUMERIC src/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
@@ -660,6 +662,9 @@ touch -r NEWS %{buildroot}%{_includedir}/%{name}/config.h
 
 
 %changelog
+* Mon Feb 15 2021 Michael Schwendt <mschwendt@fedoraproject.org> - 3.17.8-3
+- Patch to use g_get_user_runtime_dir() instead of g_get_tmp_dir()
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.17.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild