diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc
index 6526f3d7..86edf488 100644
--- a/systemd-mini-rpmlintrc
+++ b/systemd-mini-rpmlintrc
@@ -8,3 +8,4 @@ addFilter("env-script-interpreter")
 addFilter(".*files-duplicate /usr/lib/systemd/.*")
 addFilter(".*files-duplicated-waste.*")
 addFilter(".*explicit-lib-dependency .*")
+addFilter(".*tmpfile-not-in-filelist .*")
diff --git a/systemd-mini.changes b/systemd-mini.changes
index 8f6e60db..49998b05 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Sep 29 10:04:38 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Work around rpmlint complaining about /var/log/journal shipped with setgid bit
+
+  This setgid bit has been already reviewed in the past and wasn't a
+  concern. However we want the mode/ownership adjusted by tmpfiles and
+  avoid the duplication of these info in rpm.
+
+- Don't ghost own any directories created dynamically by tmpfiles
+
+  Again rpmlint complains but it doesn't seem to make sense to try to
+  track all paths (including theirs perms, ownerships...) created
+  dynamically. And 'rpm -V' is likely to report issues later with
+  these paths anyway.
+
+  This effectively partially reverts the two previous commits.
+
 -------------------------------------------------------------------
 Fri Sep 24 12:56:31 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index e0e5dc51..c7cf5326 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -1365,8 +1365,6 @@ fi
 
 %{_pam_moduledir}/pam_systemd.so
 
-%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/
-
 %if %{with gnuefi}
 %dir %{_prefix}/lib/systemd/boot
 %dir %{_prefix}/lib/systemd/boot/efi
@@ -1435,14 +1433,6 @@ fi
 %{_modprobedir}/systemd.conf
 
 # Some files created at runtime.
-%ghost %{_rundir}/log
-%ghost %{_rundir}/systemd
-%ghost %{_rundir}/systemd/ask-password
-%ghost %{_rundir}/systemd/seats
-%ghost %{_rundir}/systemd/sessions
-%ghost %{_rundir}/systemd/users
-%ghost %{_rundir}/systemd/machines
-%ghost %{_rundir}/systemd/shutdown
 %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
 %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
 %ghost %config(noreplace) %{_sysconfdir}/locale.conf
@@ -1774,7 +1764,6 @@ fi
 %{_mandir}/man8/systemd-journal-remote.*
 %{_mandir}/man8/systemd-journal-upload.*
 %{_datadir}/systemd/gatewayd
-%ghost %dir %{_localstatedir}/log/journal/remote
 %endif
 
 %if %{with networkd} || %{with resolved}
@@ -1797,10 +1786,6 @@ fi
 %{_unitdir}/systemd-networkd.socket
 %{_unitdir}/systemd-networkd-wait-online.service
 # Some files created at runtime
-%ghost %{_rundir}/systemd/netif
-%ghost %{_rundir}/systemd/netif/links
-%ghost %{_rundir}/systemd/netif/leases
-%ghost %{_rundir}/systemd/netif/lldp
 %endif
 %if %{with resolved}
 %{_bindir}/resolvectl
diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc
index 6526f3d7..86edf488 100644
--- a/systemd-rpmlintrc
+++ b/systemd-rpmlintrc
@@ -8,3 +8,4 @@ addFilter("env-script-interpreter")
 addFilter(".*files-duplicate /usr/lib/systemd/.*")
 addFilter(".*files-duplicated-waste.*")
 addFilter(".*explicit-lib-dependency .*")
+addFilter(".*tmpfile-not-in-filelist .*")
diff --git a/systemd.changes b/systemd.changes
index 8f6e60db..49998b05 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Sep 29 10:04:38 UTC 2021 - Franck Bui <fbui@suse.com>
+
+- Work around rpmlint complaining about /var/log/journal shipped with setgid bit
+
+  This setgid bit has been already reviewed in the past and wasn't a
+  concern. However we want the mode/ownership adjusted by tmpfiles and
+  avoid the duplication of these info in rpm.
+
+- Don't ghost own any directories created dynamically by tmpfiles
+
+  Again rpmlint complains but it doesn't seem to make sense to try to
+  track all paths (including theirs perms, ownerships...) created
+  dynamically. And 'rpm -V' is likely to report issues later with
+  these paths anyway.
+
+  This effectively partially reverts the two previous commits.
+
 -------------------------------------------------------------------
 Fri Sep 24 12:56:31 UTC 2021 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index 3971cbe8..bd5c5924 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1363,8 +1363,6 @@ fi
 
 %{_pam_moduledir}/pam_systemd.so
 
-%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/
-
 %if %{with gnuefi}
 %dir %{_prefix}/lib/systemd/boot
 %dir %{_prefix}/lib/systemd/boot/efi
@@ -1433,14 +1431,6 @@ fi
 %{_modprobedir}/systemd.conf
 
 # Some files created at runtime.
-%ghost %{_rundir}/log
-%ghost %{_rundir}/systemd
-%ghost %{_rundir}/systemd/ask-password
-%ghost %{_rundir}/systemd/seats
-%ghost %{_rundir}/systemd/sessions
-%ghost %{_rundir}/systemd/users
-%ghost %{_rundir}/systemd/machines
-%ghost %{_rundir}/systemd/shutdown
 %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
 %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
 %ghost %config(noreplace) %{_sysconfdir}/locale.conf
@@ -1772,7 +1762,6 @@ fi
 %{_mandir}/man8/systemd-journal-remote.*
 %{_mandir}/man8/systemd-journal-upload.*
 %{_datadir}/systemd/gatewayd
-%ghost %dir %{_localstatedir}/log/journal/remote
 %endif
 
 %if %{with networkd} || %{with resolved}
@@ -1795,10 +1784,6 @@ fi
 %{_unitdir}/systemd-networkd.socket
 %{_unitdir}/systemd-networkd-wait-online.service
 # Some files created at runtime
-%ghost %{_rundir}/systemd/netif
-%ghost %{_rundir}/systemd/netif/links
-%ghost %{_rundir}/systemd/netif/leases
-%ghost %{_rundir}/systemd/netif/lldp
 %endif
 %if %{with resolved}
 %{_bindir}/resolvectl