diff --git a/dovecot.spec b/dovecot.spec
index c9c4bff..524fa49 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -6,7 +6,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.3.16
 %global prever %{nil}
-Release: 4%{?dist}
+Release: 5%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 
@@ -466,6 +466,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Tue Jul 05 2022 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.16-5
+- workaround sysuers macro defficiency (#2095399)
+
 * Tue Jul 05 2022 Michal Hlavinka <mhlavink@redhat.com> - 1:2.3.16-4
 - use systemd-sysusers for user creation (#2095399)
 
diff --git a/dovecot.sysusers b/dovecot.sysusers
index 890928f..c286ee4 100644
--- a/dovecot.sysusers
+++ b/dovecot.sysusers
@@ -4,6 +4,6 @@ u     dovecot 97   "Dovecot IMAP server"        /usr/libexec/dovecot /sbin/nolog
 m     dovecot dovecot
 
 g     dovenull -
-u     dovenull -   "Dovecot's unauthorized user" /usr/libexec/dovecot /sbin/nologin
+u     dovenull -   "Dovecot - unauthorized user" /usr/libexec/dovecot /sbin/nologin
 m     dovenull dovenull