diff --git a/mc-tmpdir.patch b/mc-tmpdir.patch
new file mode 100644
index 0000000..34a29f0
--- /dev/null
+++ b/mc-tmpdir.patch
@@ -0,0 +1,32 @@
+diff -up mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir mc-4.8.24/contrib/mc-wrapper.sh.in
+--- mc-4.8.24/contrib/mc-wrapper.sh.in.tmpdir	2020-01-27 09:17:46.815515791 +0100
++++ mc-4.8.24/contrib/mc-wrapper.sh.in	2020-01-27 09:18:01.430712110 +0100
+@@ -1,5 +1,5 @@
+ MC_USER=`whoami`
+-MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
++MC_PWD_FILE="${TMPDIR-/var/tmp}/mc-$MC_USER/mc.pwd.$$"
+ @bindir@/mc -P "$MC_PWD_FILE" "$@"
+ 
+ if test -r "$MC_PWD_FILE"; then
+--- mc-4.8.21/lib/global.h~
++++ mc-4.8.21/lib/global.h
+@@ -131,7 +131,7 @@
+ #define PATH_SEP_STR "/"
+ #define IS_PATH_SEP(c) ((c) == PATH_SEP)
+ #define PATH_ENV_SEP ':'
+-#define TMPDIR_DEFAULT "/tmp"
++#define TMPDIR_DEFAULT "/var/tmp"
+ #define SCRIPT_SUFFIX ""
+ #define get_default_editor() "vi"
+ #define OS_SORT_CASE_SENSITIVE_DEFAULT TRUE
+--- mc-4.8.22/contrib/mc-wrapper.csh.in~
++++ mc-4.8.22/contrib/mc-wrapper.csh.in
+@@ -3,7 +3,7 @@
+ if ($?TMPDIR) then
+ 	setenv MC_PWD_FILE $TMPDIR/mc-$MC_USER/mc.pwd.$$
+ else
+-	setenv MC_PWD_FILE /tmp/mc-$MC_USER/mc.pwd.$$
++	setenv MC_PWD_FILE /var/tmp/mc-$MC_USER/mc.pwd.$$
+ endif
+ 
+ @bindir@/mc -P "$MC_PWD_FILE" $*
diff --git a/mc.spec b/mc.spec
index ba2bece..983e0fc 100644
--- a/mc.spec
+++ b/mc.spec
@@ -4,7 +4,7 @@ Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Epoch:		1
 Version:	4.8.24
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv3+
 URL:		http://www.midnight-commander.org/
 Source0:	http://www.midnight-commander.org/downloads/mc-%{version}.tar.xz
@@ -12,6 +12,7 @@ Patch1:		%{name}-spec.syntax.patch
 Patch2:		%{name}-rpm.patch
 Patch3:		%{name}-python3.patch
 Patch4:		%{name}-default_setup.patch
+Patch5:		%{name}-tmpdir.patch
 BuildRequires:	e2fsprogs-devel
 BuildRequires:  gcc
 BuildRequires:	glib2-devel
@@ -91,6 +92,9 @@ Midnight Commander s3+ and UC1541 EXTFS backend scripts.
 %{_libexecdir}/mc/extfs.d/{s3+,uc1541}
 
 %changelog
+* Mon Jan 27 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.24-3
+- be sure to use /var/tmp instead of /tmp (#1795006)
+
 * Tue Jan 21 2020 Jindrich Novy <jnovy@redhat.com> - 1:4.8.24-2
 - update to 4.8.24
 - drop merged tmpdir patch