diff --git a/SPECS/munge.spec b/SPECS/munge.spec
index 8ef61c2..8ee6d93 100644
--- a/SPECS/munge.spec
+++ b/SPECS/munge.spec
@@ -1,9 +1,8 @@
 Name:           munge
 Version:        0.5.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Enables uid & gid authentication across a host cluster
 
-Group:          Applications/System
 # The libs and devel package is GPLv3+ and LGPLv3+ where as the main package is GPLv3 only.
 License:        GPLv3+ and LGPLv3+
 URL:            https://dun.github.io/munge/
@@ -11,9 +10,11 @@ Source0:        https://github.com/dun/munge/releases/download/munge-%{version}/
 Source1:        create-munge-key
 Source2:        munge.logrotate
 
-BuildRequires:  systemd-units
-BuildRequires:  zlib-devel bzip2-devel libgcrypt-devel
+BuildRequires:  gcc
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  zlib-devel bzip2-devel openssl-devel
 Requires:       munge-libs = %{version}-%{release}
+Requires:       logrotate
 
 Requires(pre):    shadow-utils
 
@@ -21,7 +22,6 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
 
-
 %description
 MUNGE (MUNGE Uid 'N' Gid Emporium) is an authentication service for creating 
 and validating credentials. It is designed to be highly scalable for use 
@@ -35,7 +35,6 @@ methods.
 
 %package devel
 Summary:        Development files for uid * gid authentication across a host cluster
-Group:          Applications/System
 Requires:       munge-libs%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -43,7 +42,6 @@ Header files for developing using MUNGE.
 
 %package libs
 Summary:        Runtime libs for uid * gid authentication across a host cluster
-Group:          Applications/System
 
 %description libs
 Runtime libraries for using MUNGE.
@@ -55,7 +53,8 @@ cp -p %{SOURCE1} create-munge-key
 cp -p %{SOURCE2} munge.logrotate
 
 %build
-%configure  --disable-static --with-crypto-lib=libgcrypt
+%configure  --disable-static --with-crypto-lib=openssl
+echo "d /run/munge 0755 munge munge -" > src/etc/munge.tmpfiles.conf.in
 # Get rid of some rpaths for /usr/sbin
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -63,9 +62,7 @@ make %{?_smp_mflags}
 
 
 %install
-
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%make_install
 
 # Install extra files.
 install -p -m 755 create-munge-key %{buildroot}/%{_sbindir}/create-munge-key
@@ -88,12 +85,7 @@ chmod 700 %{buildroot}%{_sysconfdir}/munge
 # i.e it is not actually included in the rpm, only the record 
 # of it is.
 touch %{buildroot}%{_var}/run/munge/munged.pid
-
-%clean
-rm -rf %{buildroot}
-
-%postun 
-%systemd_postun_with_restart munge.service
+mv %{buildroot}%{_var}/run %{buildroot}
 
 %preun
 %systemd_preun munge.service
@@ -109,8 +101,10 @@ exit 0
 %post
 %systemd_post munge.service
 
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%postun
+%systemd_postun_with_restart munge.service
+
+%ldconfig_scriptlets   libs
 
 %files
 %{_bindir}/munge
@@ -126,14 +120,15 @@ exit 0
 %{_unitdir}/munge.service
 
 %attr(0700,munge,munge) %dir  %{_var}/log/munge
-%attr(0700,munge,munge) %dir %{_sysconfdir}/munge
-%attr(0755,munge,munge) %dir  %{_var}/run/munge/
-%attr(0644,munge,munge)    %ghost %{_var}/run/munge/munged.pid
 %attr(0700,munge,munge) %dir  %{_var}/lib/munge
+%attr(0700,munge,munge) %dir %{_sysconfdir}/munge
+%attr(0755,munge,munge) %dir   /run/munge/
+%attr(0644,munge,munge) %ghost /run/munge/munged.pid
 
 %config(noreplace) %{_tmpfilesdir}/munge.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/munge
 
+%license COPYING COPYING.LESSER
 %doc AUTHORS
 %doc JARGON META NEWS QUICKSTART README 
 %doc doc
@@ -141,7 +136,6 @@ exit 0
 %files libs
 %{_libdir}/libmunge.so.2
 %{_libdir}/libmunge.so.2.0.0
-%doc COPYING COPYING.LESSER
 
 %files devel
 %{_includedir}/munge.h
@@ -165,6 +159,10 @@ exit 0
 
 
 %changelog
+* Fri Apr 24 2020 Honggang Li <honli@redhat.com> - 0.5.13-2
+- Don't create temporary files in legacy directory
+- Resolves: bz1805956
+
 * Thu Jul 19 2018 Jarod Wilson <jarod@redhat.com> - 0.5.13-1
 - Update to upstream 0.5.13 release