diff --git a/munin-node.logrotate b/munin-node.logrotate
index a77de03..c674db4 100644
--- a/munin-node.logrotate
+++ b/munin-node.logrotate
@@ -1,6 +1,5 @@
 /var/log/munin-node/munin-node.log {
 	missingok
 	notifempty
-	compress
 	copytruncate
 }
diff --git a/munin.logrotate b/munin.logrotate
index 3953c6d..109748b 100644
--- a/munin.logrotate
+++ b/munin.logrotate
@@ -1,35 +1,9 @@
-/var/log/munin/munin-cgi-graph.log {
-        missingok
-        notifempty
-        compress
-}
-
-/var/log/munin/munin-cgi-html.log {
-        missingok
-        notifempty
-        compress
-}
-
-/var/log/munin/munin-graph.log {
-        missingok
-        notifempty
-        compress
-}
-
-/var/log/munin/munin-html.log {
-        missingok
-        notifempty
-        compress
-}
-
-/var/log/munin/munin-limits.log {
-        missingok
-        notifempty
-        compress
-}
-
+/var/log/munin/munin-cgi-graph.log
+/var/log/munin/munin-cgi-html.log
+/var/log/munin/munin-graph.log
+/var/log/munin/munin-html.log
+/var/log/munin/munin-limits.log
 /var/log/munin/munin-update.log {
         missingok
         notifempty
-        compress
 }
diff --git a/munin.service b/munin.service
index 6b2bba4..b9586f6 100644
--- a/munin.service
+++ b/munin.service
@@ -6,7 +6,7 @@ After=network.target network-online.target munin-node.service
 [Service]
 User=munin
 ExecStart=/usr/bin/munin-cron
-PrivateDevices=yes
+PrivateDevices=no
 PrivateTmp=yes
 ProtectHome=yes
 ProtectSystem=full
diff --git a/munin.spec b/munin.spec
index 6242b31..3f4f1a4 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:      munin
-Version:   2.0.63
-Release:   2%{?dist}
+Version:   2.0.65
+Release:   1%{?dist}
 Summary:   Network-wide resource monitoring tool
 License:   GPLv2
 URL:       http://munin-monitoring.org/
@@ -75,7 +75,9 @@ BuildRequires:  firewalld-filesystem
 Requires:       %{name}-common = %{version}
 Requires:       %{name}-web-support
 Requires:       logrotate
+%if 0%{?rhel} == 6
 Requires:       tmpwatch
+%endif
 Requires:       rrdtool
 Requires:       /bin/mail
 Requires:       perl(FCGI)
@@ -335,9 +337,8 @@ cp %{SOURCE200} %{buildroot}%{_datadir}/munin/plugins/
 cp %{SOURCE300} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/
 cp %{SOURCE301} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/
 
-# Create plugin state dirs
-mkdir -p %{buildroot}%{_sharedstatedir}/munin/plugin-state/root
-mkdir -p %{buildroot}%{_sharedstatedir}/munin/plugin-state/munin
+# Create plugin state dir
+mkdir -p %{buildroot}%{_sharedstatedir}/munin/plugin-state
 
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 19
 mkdir -p %{buildroot}/%{_prefix}/lib/firewalld/services
@@ -446,11 +447,11 @@ exit 0
 %post
 # Create log files
 [ -f %{_localstatedir}/log/munin/munin-html.log ] || \
-    /usr/bin/install -m 0640 -o munin -g root /dev/null %{_localstatedir}/log/munin/munin-html.log
+    /usr/bin/install -m 0640 -o munin -g adm /dev/null %{_localstatedir}/log/munin/munin-html.log
 [ -f %{_localstatedir}/log/munin/munin-limits.log ] || \
-    /usr/bin/install -m 0640 -o munin -g root /dev/null %{_localstatedir}/log/munin/munin-limits.log
+    /usr/bin/install -m 0640 -o munin -g adm /dev/null %{_localstatedir}/log/munin/munin-limits.log
 [ -f %{_localstatedir}/log/munin/munin-update.log ] || \
-    /usr/bin/install -m 0640 -o munin -g root /dev/null %{_localstatedir}/log/munin/munin-update.log
+    /usr/bin/install -m 0640 -o munin -g adm /dev/null %{_localstatedir}/log/munin/munin-update.log
 # On new install only: create simple localhost config.
 if [ "$1" = "1" ]; then
     if [ ! -f %{_sysconfdir}/munin/conf.d/local.conf ]; then
@@ -476,11 +477,6 @@ fi
 
 %postun
 %systemd_postun_with_restart munin-rrdcached.service munin.timer
-
-
-%triggerun -- munin < 2.0.42-2
-setfacl --remove-all %{_rundir}/munin
-chmod 775 %{_rundir}/munin
 %endif
 
 
@@ -501,7 +497,7 @@ exit 0
 %endif
 # Create log file
 [ -f %{_localstatedir}/log/munin-node/munin-node.log ] || \
-    /usr/bin/install -m 0640 -o root -g root /dev/null %{_localstatedir}/log/munin-node/munin-node.log
+    /usr/bin/install -m 0640 -o root -g adm /dev/null %{_localstatedir}/log/munin-node/munin-node.log
 # Only run configure on a new install, not an upgrade.
 if [ "$1" = "1" ]; then
     %{_sbindir}/munin-node-configure --shell 2> /dev/null | sh >& /dev/null || :
@@ -543,22 +539,6 @@ fi
 %endif
 
 
-%triggerun node -- munin-node < 2.0.40-2
-if ls %{_localstatedir}/log/munin/munin-node.log* >/dev/null 2>&1; then
-    mv -f %{_localstatedir}/log/munin/munin-node.log* %{_localstatedir}/log/munin-node/
-fi
-chown -R munin:munin %{_sharedstatedir}/munin/spool/ >/dev/null 2>&1
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16
-systemctl daemon-reload
-%systemd_postun_with_restart munin-node.service munin-asyncd.service
-%else
-if [ $1 -ge 1 ]; then
-    /sbin/service munin-node condrestart >/dev/null 2>&1
-    /sbin/service munin-asyncd condrestart >/dev/null 2>&1
-fi
-%endif
-
-
 %pre common
 getent group munin >/dev/null || groupadd -r munin
 getent passwd munin >/dev/null || \
@@ -566,13 +546,6 @@ useradd -r -g munin -d %{_sharedstatedir}/munin -s /bin/sh -c "Munin user" munin
 exit 0
 
 
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16
-%triggerun common -- munin-common < 2.0.42-2
-setfacl --remove-all %{_rundir}/munin
-chmod 775 %{_rundir}/munin
-%endif
-
-
 %post nginx
 # Create log files
 [ -f %{_localstatedir}/log/munin/munin-cgi-graph.log ] || \
@@ -660,12 +633,12 @@ fi
 %{perl_vendorlib}/Munin/Master
 %attr(-, munin, munin) %dir %{_sharedstatedir}/munin
 %attr(0700, munin, munin) %dir %{_sharedstatedir}/munin/.ssh
-%attr(-, munin, munin) %dir %{_localstatedir}/log/munin
+%attr(0750, munin, adm) %dir %{_localstatedir}/log/munin
 %attr(-, munin, munin) %dir %{_localstatedir}/www/html/munin
 %attr(-, munin, munin) %{_localstatedir}/www/html/munin/cgi
-%attr(0640, munin, root) %ghost %{_localstatedir}/log/munin/munin-html.log
-%attr(0640, munin, root) %ghost %{_localstatedir}/log/munin/munin-limits.log
-%attr(0640, munin, root) %ghost %{_localstatedir}/log/munin/munin-update.log
+%attr(0640, munin, adm) %ghost %{_localstatedir}/log/munin/munin-html.log
+%attr(0640, munin, adm) %ghost %{_localstatedir}/log/munin/munin-limits.log
+%attr(0640, munin, adm) %ghost %{_localstatedir}/log/munin/munin-update.log
 %if 0%{?rhel} >= 7 || 0%{?fedora} >= 16
 %attr(-, munin, munin) %dir %{_sharedstatedir}/munin/rrdcached
 %{_unitdir}/munin-rrdcached.service
@@ -714,13 +687,11 @@ fi
 %{_prefix}/lib/firewalld/services/munin-node.xml
 %endif
 %attr(-, munin, munin) %dir %{_sharedstatedir}/munin
-%attr(0775, root, munin) %dir %{_sharedstatedir}/munin/plugin-state
-%attr(-, root, munin) %dir %{_sharedstatedir}/munin/plugin-state/root
-%attr(-, munin, munin) %dir %{_sharedstatedir}/munin/plugin-state/munin
+%attr(-, root, root) %dir %{_sharedstatedir}/munin/plugin-state
 %attr(-, munin, munin) %dir %{_sharedstatedir}/munin/spool
 %attr(0700, munin, munin) %dir %{_sharedstatedir}/munin/.ssh
-%attr(0755, root, root) %dir %{_localstatedir}/log/munin-node
-%attr(0640, root, root) %ghost %{_localstatedir}/log/munin-node/munin-node.log
+%attr(0750, root, adm) %dir %{_localstatedir}/log/munin-node
+%attr(0640, root, adm) %ghost %{_localstatedir}/log/munin-node/munin-node.log
 
 
 %files common
@@ -769,6 +740,12 @@ fi
 
 
 %changelog
+* Tue Nov 17 2020 Kim B. Heino <b@bbbs.net> - 2.0.65-1
+- Upgrade to 2.0.65
+- Improve plugin-state directory owners
+- Don't require tmpwatch
+- Change log file owner to root:adm or munin:adm
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.63-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/munin.tmpfilesd b/munin.tmpfilesd
index 561bee2..68ba12f 100644
--- a/munin.tmpfilesd
+++ b/munin.tmpfilesd
@@ -10,6 +10,5 @@ x /var/lib/munin/plugin-state
 x /var/lib/munin/rrdcached
 
 e /var/lib/munin/cgi-tmp/* - - - 1d
-e /var/lib/munin/plugin-state/* - - - 14d
 e /var/lib/munin/spool - - - 14d
 e /var/lib/munin - - - 30d